ish_manager 0.1.8.473 → 0.1.8.475

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3b95fb98acfcf04033ba69dbd7a10b86c21515d0ccbe1c7f6ad109f2f2fd88a
-  data.tar.gz: 14f7b4fcd867f2db13a52f5134ae1b76370dad9f4ca2da263c1c6fb1d584d0ff
+  metadata.gz: b0745f9f4eb8cc5c261f4b68f5048a83dd168225157da0d302112a8368d8fc47
+  data.tar.gz: 6382edc9a7074c39ea8be58196a21514332dc1d7b9d95b25cecd449ba95d6bea
 SHA512:
-  metadata.gz: 3b9020667e6773781f76920a5f39716d255ca222d12dd94463e7a6bcc65ba214432cd372f1a472c5c286549edf04f9ef288f1eeccd94ffeb96fbcda2a0d112ab
-  data.tar.gz: 9ea41fd43030d3453c7ef25972b907773d4f2efba71fbd0ac0b8268eb756e1bb01d85b6d41a3405c4b5d151f671c83fed8c0a81fa5b44a6052f6ee6f2f7f0f5c
+  metadata.gz: 4ea6e1c87c80facfc4b8eaebe97f068ee529568f3256211175e27cab0ddb14f838d4741ba7dae33ec1608e1ccf9e145e3a6a78f657e50d881e29257d9cd83e44
+  data.tar.gz: 27aa93073a85328e1bd0e6f5e290a1033dbdc25c22736d8726515c3b5c4aca4336d92297d71d45aa9d02ff1467ae7af6551bf61e3f028fe6de5624f6938cbbb6

data/app/assets/javascripts/ish_manager/application.js

@@ -127,8 +127,12 @@ $(function () {
       lengthMenu: [[10, 25, 100, -1], [10, 25, 100, 'All']],
       lengthChange: true,
     }
-    $('#dataTable').DataTable(_props)
-    $('.data-table').DataTable(_props)
+    // $('#dataTable').DataTable(_props)
+    var dataTable = $('.data-table').DataTable(_props)
+
+    $('#dataTableSearch').on( 'keyup', function () {
+      dataTable.search( this.value ).draw();
+  } );
   }
 
   if ('function' === typeof $('body').datepicker) {

data/app/controllers/ish_manager/email_conversations_controller.rb

@@ -1,7 +1,7 @@
 
 class ::IshManager::EmailConversationsController < IshManager::ApplicationController
 
-  before_action :set_lists
+  before_action :set_lists, except: [ :index ]
 
   def index
     authorize! :email_conversations_index, IshManager::Ability
@@ -23,6 +23,7 @@ class ::IshManager::EmailConversationsController < IshManager::ApplicationContro
     end
 
     @email_conversations = @email_conversations.order_by( latest_at: :desc
+      ).includes( :email_messages # , :lead_ties
       ).page( params[:conv_page]
       ).per( per_page )
   end

data/app/views/ish_manager/application/_main_header_admin.haml

@@ -12,7 +12,7 @@
     .a
       %ul
         %li
-          = render 'ish_manager/galleries/menu', count: Gallery.all.count
+          = render 'ish_manager/galleries/menu', count: Gallery.all.length
         %li
           = link_to 'Reports',   reports_path
           .inline-search
@@ -58,7 +58,7 @@
           = link_to "#{WpTag::INBOX} (#{Office::EmailConversation.in_emailtag(WpTag::INBOX).length})", email_conversations_in_path(WpTag::INBOX), class: 'chip'
           = link_to '[+]', new_email_context_path
         %li
-          = link_to "Tmpls (#{Ish::EmailTemplate.all.count})", email_templates_path
+          = link_to "Tmpls (#{Ish::EmailTemplate.all.length})", email_templates_path
           = link_to '[+]', new_email_template_path
         %li
           = link_to "Companies (#{Leadset.kept.length})", leadsets_path
@@ -67,7 +67,7 @@
               = text_field_tag :q
           = link_to '[+]', new_leadset_path
         %li
-          = link_to "EActions (#{Office::EmailAction.count})", email_actions_path
+          = link_to "EActions (#{Office::EmailAction.all.length})", email_actions_path
           = link_to '[+]', new_email_action_path
       %ul
         %li
@@ -97,10 +97,10 @@
           = link_to 'Lead Action Templatess', lead_action_templates_path
           -# = link_to '[+]', new_lead_action_template_path
         %li
-          = link_to "Campaigns (#{Ish::EmailCampaign.count})", email_campaigns_path
+          = link_to "Campaigns (#{Ish::EmailCampaign.all.length})", email_campaigns_path
           = link_to '[+]', new_email_campaign_path
         %li
-          = link_to "OActions (#{Office::Action.count})", office_actions_path
+          = link_to "OActions (#{Office::Action.all.length})", office_actions_path
           = link_to '[+]', new_office_action_path
 
       %ul

data/app/views/ish_manager/email_conversations/index.haml

@@ -34,14 +34,14 @@
   %br
   = render 'paginate',  resource: @email_conversations, param_name: :conv_page, views_prefix: :ish_manager
 
-  %table.conversations
+  %table.conversations.bordered
     %tr
       %th
         .chip.select-all
           = check_box_tag :select_all
           .n-selected -
       %th Msgs
-      %th Leads
+      %th From emails
       %th Subject
       %th Datetime
       %th Tags
@@ -51,10 +51,11 @@
         .item
           %td= check_box_tag 'email_conversation_ids[]', conv.id.to_s, nil, { class: 'i-sel' }
           %td.count
-            (#{conv.email_messages.count})
+            (#{conv.email_messages.length})
 
           %td.leads
-            = conv.leads.map { |lead| lead.email }.join(", ")
+            -# <leads>
+            = conv.from_emails.join(", ")
 
           %td.subject
             = link_to conv.subject, email_conversation_path( conv )
@@ -65,9 +66,10 @@
 
           %td
             .tags
-              - conv.tags.each do |tag|
-                .chip
-                  = tag.name
+              <tags>
+              -# - conv.tags.each do |tag|
+              -#   .chip
+              -#     = tag.name
 
   %br
   = render 'paginate',  resource: @email_conversations, param_name: :conv_page, views_prefix: :ish_manager

data/app/views/ish_manager/email_filters/index.haml

@@ -5,19 +5,21 @@
       Email Filters (#{@email_filters.length})
       = link_to '[+]', new_email_filter_path
 
-  %table.bordered
-    %tr
-      %th  
-      %th  
-      %th From Regex
-      %th From Exact
-      %th Subject Regex
-      %th Subject Exact
-      %th Body Exact
-      %th Kind
-      %th Email Action
-      %th Email Template
-      %th Email Tag
+  -# %input#dataTableSearch
+  %table.bordered.data-table
+    %thead
+      %tr
+        %th  
+        %th  
+        %th From Regex
+        %th From Exact
+        %th Subject Regex
+        %th Subject Exact
+        %th Body Exact
+        %th Kind
+        %th Email Action
+        %th Email Template
+        %th Email Tag
     - @email_filters.each do |ef|
 
       %tr
@@ -25,8 +27,10 @@
         %td
           = link_to '[~]', edit_email_filter_path(ef)
           .inline-block= button_to '[x]', email_filter_path(ef), method: :delete, data: { confirm: 'Are you sure?' }
-        %td= ef.from_regex
-        %td= ef.from_exact
+        %td
+          `#{ef.from_regex}`
+        %td
+          `#{ef.from_exact}`
         %td= ef.subject_regex
         %td= ef.subject_exact
         %td= ef.body_exact

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.473
+  version: 0.1.8.475
 platform: ruby
 authors:
 - piousbox