ish_manager 0.1.8.390 → 0.1.8.392
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/controllers/ish_manager/email_templates_controller.rb +1 -0
- data/app/controllers/ish_manager/leadsets_controller.rb +0 -8
- data/app/views/ish_manager/email_templates/_plain.haml +3 -0
- data/app/views/ish_manager/email_templates/iframe_src.haml +1 -1
- data/app/views/ish_manager/galleries/_index.haml +31 -29
- data/app/views/ish_manager/galleries/_menu.haml +0 -2
- data/lib/tasks/office_tasks.rake +4 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 93cdc467e77550fd625d0f7161873674bb4a3d6fbe6ffac20f0ab49c5684c61c
|
|
4
|
+
data.tar.gz: 7a6836e9599041bf4420970a5212c65d0088b16a7933c62f29b8da3dc9a34a66
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: aa535f6d1d318d7c16dd48e7685ce9d1be8854246dc9d527ea8d11871c81aebe4e23315613672feb5df6ac374855b7b417900efea24b473a457bd46cc9422855
|
|
7
|
+
data.tar.gz: c76fa0c68da834e846c98ce4d40ddb74953d74a090122ac901c2eea7d75e7ea27200f7f20cf8a022376c1ac0970cf8139c75e13c51c40e8b98221987b704562a
|
|
@@ -33,6 +33,7 @@ class ::IshManager::EmailTemplatesController < ::IshManager::ApplicationControll
|
|
|
33
33
|
def iframe_src
|
|
34
34
|
@tmpl = @email_template = Ish::EmailTemplate.where({ id: params[:id] }).first ||
|
|
35
35
|
Ish::EmailTemplate.find_by({ slug: params[:id] })
|
|
36
|
+
@ctx = Ctx.new({ email_template: @tmpl })
|
|
36
37
|
authorize! :iframe_src, @email_template
|
|
37
38
|
render layout: false
|
|
38
39
|
end
|
|
@@ -7,7 +7,6 @@ class ::IshManager::LeadsetsController < IshManager::ApplicationController
|
|
|
7
7
|
|
|
8
8
|
def create
|
|
9
9
|
@leadset = Leadset.new params[:leadset].permit!
|
|
10
|
-
@leadset.profile = @current_profile
|
|
11
10
|
authorize! :create, @leadset
|
|
12
11
|
if @leadset.save
|
|
13
12
|
flash[:notice] = "created leadset"
|
|
@@ -18,8 +17,6 @@ class ::IshManager::LeadsetsController < IshManager::ApplicationController
|
|
|
18
17
|
end
|
|
19
18
|
|
|
20
19
|
def destroy
|
|
21
|
-
puts! params, 'params'
|
|
22
|
-
|
|
23
20
|
leadsets = Leadset.find( params[:leadset_ids] )
|
|
24
21
|
@results = []
|
|
25
22
|
leadsets.each do |leadset|
|
|
@@ -37,11 +34,6 @@ class ::IshManager::LeadsetsController < IshManager::ApplicationController
|
|
|
37
34
|
def index
|
|
38
35
|
authorize! :index, Leadset
|
|
39
36
|
@leadsets = Leadset.all.kept # where( :profile => @current_profile, :is_trash => false )
|
|
40
|
-
# if params[:is_done]
|
|
41
|
-
# @leadsets = @leadsets.where( :is_done => true )
|
|
42
|
-
# else
|
|
43
|
-
# @leadsets = @leadsets.where( :is_done => false )
|
|
44
|
-
# end
|
|
45
37
|
end
|
|
46
38
|
|
|
47
39
|
def new
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
|
|
2
|
-
= render "ish_manager/email_templates/#{@email_template.layout}"
|
|
2
|
+
= render "ish_manager/email_templates/#{@email_template.layout}"
|
|
@@ -4,35 +4,37 @@
|
|
|
4
4
|
-# _vp_ 2022-09-25 :: Small styling revision
|
|
5
5
|
-#
|
|
6
6
|
|
|
7
|
-
- n_thumbs
|
|
7
|
+
- n_thumbs ||= 12
|
|
8
8
|
|
|
9
|
-
.collapse-expand#galleriesIndex
|
|
10
|
-
= render 'ish_manager/galleries/menu', count: @galleries.count
|
|
11
9
|
.galleries--index
|
|
12
|
-
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
- @galleries.
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
10
|
+
.max-width
|
|
11
|
+
= render 'ish_manager/galleries/menu', count: @galleries.count
|
|
12
|
+
|
|
13
|
+
.padded
|
|
14
|
+
- if @galleries.length > 0
|
|
15
|
+
|
|
16
|
+
- if @galleries.respond_to? :total_pages
|
|
17
|
+
= paginate @galleries, :param_name => :galleries_page, :views_prefix => 'ish_manager'
|
|
18
|
+
|
|
19
|
+
.row
|
|
20
|
+
- @galleries.each do |g|
|
|
21
|
+
.col-sm-12.col-md-6
|
|
22
|
+
.bordered-card
|
|
23
|
+
%h5
|
|
24
|
+
= link_to '[~]', edit_gallery_path( g )
|
|
25
|
+
= link_to g.name, gallery_path(g.slug)
|
|
26
|
+
(#{g.photos.length})
|
|
27
|
+
= render 'meta', item: g
|
|
28
|
+
- if g.photos.length == 0
|
|
29
|
+
No Photos
|
|
30
|
+
- else
|
|
31
|
+
.flex-row
|
|
32
|
+
- g.photos.limit( n_thumbs ).each do |photo|
|
|
33
|
+
= link_to image_tag(photo.photo.url(:thumb), :alt => g.name), gallery_path(g.slug)
|
|
34
|
+
|
|
35
|
+
- if @galleries.respond_to? :total_pages
|
|
36
|
+
= paginate @galleries, :param_name => :galleries_page, :views_prefix => 'ish_manager'
|
|
37
|
+
|
|
38
|
+
- else
|
|
39
|
+
%h5 No Galleries
|
|
38
40
|
|
|
@@ -1,12 +1,10 @@
|
|
|
1
1
|
|
|
2
2
|
.galleries--menu
|
|
3
3
|
|
|
4
|
-
-# .title Galleries (#{@galleries.count}) #{link_to '[+]', new_gallery_path}
|
|
5
4
|
= link_to 'Galleries', galleries_path
|
|
6
5
|
- if defined?(count)
|
|
7
6
|
(#{count})
|
|
8
7
|
|
|
9
|
-
-# = render 'search', path: galleries_path
|
|
10
8
|
.inline-search
|
|
11
9
|
= form_tag galleries_path, method: :get do
|
|
12
10
|
= text_field_tag :q
|
data/lib/tasks/office_tasks.rake
CHANGED
|
@@ -6,7 +6,7 @@ end
|
|
|
6
6
|
|
|
7
7
|
namespace :office do
|
|
8
8
|
|
|
9
|
-
desc '
|
|
9
|
+
desc 'scheduled email actions, rolling perform'
|
|
10
10
|
task schs: :environment do
|
|
11
11
|
while true do
|
|
12
12
|
|
|
@@ -18,6 +18,9 @@ namespace :office do
|
|
|
18
18
|
email_template_id: sch.act.tmpl.id,
|
|
19
19
|
lead_id: sch.lead.id,
|
|
20
20
|
send_at: Time.now,
|
|
21
|
+
subject: sch.act.tmpl.subject,
|
|
22
|
+
from_email: sch.act.tmpl.from_email,
|
|
23
|
+
scheduled_email_action_id: sch.act.id,
|
|
21
24
|
})
|
|
22
25
|
ctx.save!
|
|
23
26
|
|