ish_manager 0.1.8.474 → 0.1.8.475

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: cbbc91cb570b304f736dd6e68707c5c7edfff70ad472c69abc16c3843da06ed8
4
- data.tar.gz: fa2e9004f24a7a65712a3cec0958a84cac0bd2897dc6ea0f2cc86373671447ba
3
+ metadata.gz: b0745f9f4eb8cc5c261f4b68f5048a83dd168225157da0d302112a8368d8fc47
4
+ data.tar.gz: 6382edc9a7074c39ea8be58196a21514332dc1d7b9d95b25cecd449ba95d6bea
5
5
  SHA512:
6
- metadata.gz: 556eeb65e43c306a5c38083d24dcc524e84cc29e0949f7dbf0f9c845181a58aafbc050887c98a53021b1000d686dfe796107a27119a7eea3e15dc082965aa66e
7
- data.tar.gz: cae31230ce606af64343b8dcb8401a1317da7b40dea460f345e492f5c3fb46286ce9def4a30c5ae2f1f225cd66941804783c982db65e19d38cd7283ef809dc1c
6
+ metadata.gz: 4ea6e1c87c80facfc4b8eaebe97f068ee529568f3256211175e27cab0ddb14f838d4741ba7dae33ec1608e1ccf9e145e3a6a78f657e50d881e29257d9cd83e44
7
+ data.tar.gz: 27aa93073a85328e1bd0e6f5e290a1033dbdc25c22736d8726515c3b5c4aca4336d92297d71d45aa9d02ff1467ae7af6551bf61e3f028fe6de5624f6938cbbb6
@@ -1,7 +1,7 @@
1
1
 
2
2
  class ::IshManager::EmailConversationsController < IshManager::ApplicationController
3
3
 
4
- before_action :set_lists
4
+ before_action :set_lists, except: [ :index ]
5
5
 
6
6
  def index
7
7
  authorize! :email_conversations_index, IshManager::Ability
@@ -23,6 +23,7 @@ class ::IshManager::EmailConversationsController < IshManager::ApplicationContro
23
23
  end
24
24
 
25
25
  @email_conversations = @email_conversations.order_by( latest_at: :desc
26
+ ).includes( :email_messages # , :lead_ties
26
27
  ).page( params[:conv_page]
27
28
  ).per( per_page )
28
29
  end
@@ -12,7 +12,7 @@
12
12
  .a
13
13
  %ul
14
14
  %li
15
- = render 'ish_manager/galleries/menu', count: Gallery.all.count
15
+ = render 'ish_manager/galleries/menu', count: Gallery.all.length
16
16
  %li
17
17
  = link_to 'Reports', reports_path
18
18
  .inline-search
@@ -58,7 +58,7 @@
58
58
  = link_to "#{WpTag::INBOX} (#{Office::EmailConversation.in_emailtag(WpTag::INBOX).length})", email_conversations_in_path(WpTag::INBOX), class: 'chip'
59
59
  = link_to '[+]', new_email_context_path
60
60
  %li
61
- = link_to "Tmpls (#{Ish::EmailTemplate.all.count})", email_templates_path
61
+ = link_to "Tmpls (#{Ish::EmailTemplate.all.length})", email_templates_path
62
62
  = link_to '[+]', new_email_template_path
63
63
  %li
64
64
  = link_to "Companies (#{Leadset.kept.length})", leadsets_path
@@ -67,7 +67,7 @@
67
67
  = text_field_tag :q
68
68
  = link_to '[+]', new_leadset_path
69
69
  %li
70
- = link_to "EActions (#{Office::EmailAction.count})", email_actions_path
70
+ = link_to "EActions (#{Office::EmailAction.all.length})", email_actions_path
71
71
  = link_to '[+]', new_email_action_path
72
72
  %ul
73
73
  %li
@@ -97,10 +97,10 @@
97
97
  = link_to 'Lead Action Templatess', lead_action_templates_path
98
98
  -# = link_to '[+]', new_lead_action_template_path
99
99
  %li
100
- = link_to "Campaigns (#{Ish::EmailCampaign.count})", email_campaigns_path
100
+ = link_to "Campaigns (#{Ish::EmailCampaign.all.length})", email_campaigns_path
101
101
  = link_to '[+]', new_email_campaign_path
102
102
  %li
103
- = link_to "OActions (#{Office::Action.count})", office_actions_path
103
+ = link_to "OActions (#{Office::Action.all.length})", office_actions_path
104
104
  = link_to '[+]', new_office_action_path
105
105
 
106
106
  %ul
@@ -34,14 +34,14 @@
34
34
  %br
35
35
  = render 'paginate', resource: @email_conversations, param_name: :conv_page, views_prefix: :ish_manager
36
36
 
37
- %table.conversations
37
+ %table.conversations.bordered
38
38
  %tr
39
39
  %th
40
40
  .chip.select-all
41
41
  = check_box_tag :select_all
42
42
  .n-selected -
43
43
  %th Msgs
44
- %th Leads
44
+ %th From emails
45
45
  %th Subject
46
46
  %th Datetime
47
47
  %th Tags
@@ -51,10 +51,11 @@
51
51
  .item
52
52
  %td= check_box_tag 'email_conversation_ids[]', conv.id.to_s, nil, { class: 'i-sel' }
53
53
  %td.count
54
- (#{conv.email_messages.count})
54
+ (#{conv.email_messages.length})
55
55
 
56
56
  %td.leads
57
- = conv.leads.map { |lead| lead.email }.join(", ")
57
+ -# &lt;leads>
58
+ = conv.from_emails.join(", ")
58
59
 
59
60
  %td.subject
60
61
  = link_to conv.subject, email_conversation_path( conv )
@@ -65,9 +66,10 @@
65
66
 
66
67
  %td
67
68
  .tags
68
- - conv.tags.each do |tag|
69
- .chip
70
- = tag.name
69
+ &lt;tags>
70
+ -# - conv.tags.each do |tag|
71
+ -# .chip
72
+ -# = tag.name
71
73
 
72
74
  %br
73
75
  = render 'paginate', resource: @email_conversations, param_name: :conv_page, views_prefix: :ish_manager
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ish_manager
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.8.474
4
+ version: 0.1.8.475
5
5
  platform: ruby
6
6
  authors:
7
7
  - piousbox