wco_models 3.1.0.272 → 3.1.0.273

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f7c6d7f6185fa8c1518b2dd96978eb2c7d17ad603adadf04689b0b841af2b65
-  data.tar.gz: e0f12b129a69a1a1874c4801626ca1739d91dc4e59459f9102ddd3168444a806
+  metadata.gz: ca512d6b0092918f994c079af6ed5ba93ae99067826e9834347e889fdddbd7b5
+  data.tar.gz: 63bc915b626e9a9d7d57a1e035d60b97f4f9337560ac14a374acd16e4772aa7f
 SHA512:
-  metadata.gz: 00f46e4df9282b9d6ad131c86b8e40e8d7b0ed6fa1a772b7007e6b368a7d45879100d1e692ac0bc869db9fe1240610156fc65b73b554a8b432b8bb9dae9c85f0
-  data.tar.gz: dbd1e01bf63728257c2c2c785ef4faa804da63d0f8a2904d6b3fdde7f54481d9f3246ba18b50b87921fdb60e9d373814dbc3b4898d3fb642c350dd8fb9f66abd
+  metadata.gz: c59e9ada62d5ae8d764d8c6b125ddf6486dd70b0003deba7d8207eeec061def71a07db5a21e1d0cd9a5137db60e96d297a89c49fb795668041ceca693317e166
+  data.tar.gz: b1a272aae1de7fc949db6c6cdbdb92d16e2d42b2c2f0f2e5193193f0c704ee18ee119df703d43864a7b903054d6dea80163fe3197faf7f4a523be1febc39bbcc

data/app/controllers/wco/tags_controller.rb

@@ -121,6 +121,8 @@ class Wco::TagsController < Wco::ApplicationController
     @leadsets  = @tag.leadsets.page( params[::Wco::Leadset::PAGE_PARAM_NAME] ).per( current_profile.per_page )
     @reports   = @tag.reports.page( params[:reports_page] ).per( current_profile.per_page )
 
+    @conversations, @messages, _ = WcoEmail::Conversation.load_conversations_messages_tag_by_params_and_profile( {tagname: @tag.slug}, current_profile )
+
     # render params['template'] || 'show'
   end
 

data/app/models/wco_email/conversation.rb

@@ -5,7 +5,7 @@ class WcoEmail::Conversation
   include Mongoid::Paranoia
   store_in collection: 'office_email_conversations'
 
-  PAGE_PARAM_NAME = 'conversations_page'
+  PAGE_PARAM_NAME = 'conv_page'
 
   STATUS_UNREAD = 'status_unread'
   STATUS_READ   = 'status_read'

data/app/views/wco/tags/show.haml

@@ -24,10 +24,13 @@
 
     - if defined?( wco_email )
 
-      - if @tag.conversations.present?
+      - if @conversations.present?
         %i.fa.fa-compress.collapse-expand#conversations
-          Conversations (#{@tag.conversations.length}):
-        .descr= render '/wco_email/conversations/table', convs: @tag.conversations.page( params[::WcoEmail::Conversation::PAGE_PARAM_NAME] )
+          Conversations (#{@conversations.length}):
+        .descr
+          = render '/wco/paginate', resource: @conversations, param_name: ::WcoEmail::Conversation::PAGE_PARAM_NAME
+          = render '/wco_email/conversations/table', convs: @conversations
+          = render '/wco/paginate', resource: @conversations, param_name: ::WcoEmail::Conversation::PAGE_PARAM_NAME
 
       - if @tag.email_templates.present?
         %hr

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wco_models
 version: !ruby/object:Gem::Version
-  version: 3.1.0.272
+  version: 3.1.0.273
 platform: ruby
 authors:
 - Victor Pudeyev