ish_manager 0.1.8.474 → 0.1.8.476

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbbc91cb570b304f736dd6e68707c5c7edfff70ad472c69abc16c3843da06ed8
-  data.tar.gz: fa2e9004f24a7a65712a3cec0958a84cac0bd2897dc6ea0f2cc86373671447ba
+  metadata.gz: 25a1c311a0b599ca5647ea2f3125670e5f6d2a30961fd9bdc910cff357b2f898
+  data.tar.gz: 3e36fdeebf66357575f5f7dd03bf4423cb48efae59d01fae1b121e9f9f8b5023
 SHA512:
-  metadata.gz: 556eeb65e43c306a5c38083d24dcc524e84cc29e0949f7dbf0f9c845181a58aafbc050887c98a53021b1000d686dfe796107a27119a7eea3e15dc082965aa66e
-  data.tar.gz: cae31230ce606af64343b8dcb8401a1317da7b40dea460f345e492f5c3fb46286ce9def4a30c5ae2f1f225cd66941804783c982db65e19d38cd7283ef809dc1c
+  metadata.gz: 0d17b1fc1c52597aba2b6b1619528d037560c96ada41a32bf6a415fcf6ec18423a5a7ce645d1fd193c959fbad970b0fd1ce122eaa7e6508eed4dbfb28430df7d
+  data.tar.gz: 07ce5ba415150ee7183978f3816b433dd633cec7ab9b22248172a1833538742963f60229fcaff3303b87cbbbdb21476a6b2e525fad3b0a31a00dd85721a52f73

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
@@ -31,7 +32,7 @@ class ::IshManager::EmailConversationsController < IshManager::ApplicationContro
   def show
     authorize! :email_conversations_show, IshManager::Ability
     @email_conversation = ::Office::EmailConversation.find( params[:id] )
-    @email_messages = @email_conversation.email_messages.order_by( date: :asc )
+    @email_messages     = @email_conversation.email_messages.order_by( date: :asc )
     @email_conversation.update_attributes({ state: Conv::STATE_READ })
   end
 

data/app/controllers/ish_manager/leads_controller.rb

@@ -132,11 +132,12 @@ class ::IshManager::LeadsController < IshManager::ApplicationController
   end
 
   def show
-    @lead = Lead.find params[:id]
+    @lead      = Lead.find params[:id]
     authorize! :show, @lead
-    @schs = Sch.where( lead_id: @lead.id )
-    @ctxs = Ctx.where( lead_id: @lead.id )
-    @msgs = Msg.where( from: @lead.email )
+    @schs      = Sch.where( lead_id: @lead.id )
+    @ctxs      = Ctx.where( lead_id: @lead.id )
+    @convs     = Conv.find( Office::EmailConversationLead.where( lead_id: @lead.id ).map( &:email_conversation_id ) )
+    @msgs      = Msg.where( from: @lead.email )
     @galleries = @lead.galleries.page( params[:galleries_page] ).per( current_profile.per_page )
     @videos    = @lead.videos.page( params[:videos_page]       ).per( current_profile.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/leads/show.haml

@@ -71,13 +71,11 @@
 
   .row
     .col-md-12.msgs
-      %h5 Email Messages (#{@msgs.length})
-      .descr @TODO: these used to be links, but now they are broken. _vp_ 2023-08-10
+      %h5 Email Conversations (#{@convs.length})
       %ul
-        - @msgs.each do |msg|
+        - @convs.each do |conv|
           %li
-            = msg.subject
-            -#   = link_to msg.subject, email_conversation_path( msg.conv )
+            = link_to conv.subject, email_conversation_path( conv )
 
   .row
     .col-md-6

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.474
+  version: 0.1.8.476
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-23 00:00:00.000000000 Z
+date: 2023-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails