wco_models 3.1.0.75 → 3.1.0.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ac0ff430c81efd11aced2ffa36e17bd8aebdad6e337ea3ef981adbe6154e35b
-  data.tar.gz: bc47f58cbac8d53afd585068c2f2de34768176a268126b1f05779c8cda55ec68
+  metadata.gz: ce2fdb73b44011dfcb8d9805e54ca598aefa78f7912afab54aa855d4e02a4707
+  data.tar.gz: 7c3689e7460ee1ada0ee293417f72d4c860c1360d7d35ac03c4990bbfaf421f5
 SHA512:
-  metadata.gz: b2b311cab305457585ca0a98e9f8381537747a3c2d6b5b407be0c8c0d88615b13292e6849118d81bc16cb30116b20a8a3b65b12f5fd9edb3a91512489333d84e
-  data.tar.gz: f4484697303ebf15d0f39b35f835911c01ea812336d14ba833d0df4ca7de4fb3ac9b53313cdd328e81c234c64b162c8209d928f6d0952cef7a17b5cec9f5e914
+  metadata.gz: 302daada8d9b6344abe54308ca9532a15588f4463c5218cbff9aecd73df1d8d76d4653c612cddf70e4120814a4cd7d432141d488fa75e5e8d9f383b9a0d278e0
+  data.tar.gz: 63d7c4e56bee07d53c0c9e390bea15b3307a2339b8e633d72cb72c4c2b4e33b061706b5e9fa73ac955a4dc69cf0aa26adf503eee720507bcf3dbe2a08335fd81

data/app/assets/stylesheets/wco/utils.scss

@@ -35,12 +35,12 @@ textarea {
 
 table.bordered {
   table-layout:fixed;
-  width: 100%;
+  width: auto; // 100%;
   word-wrap: break-word;
 
   border: 1px solid gray;
-  border-bottom: 0;
-  border-right: 0;
+  // border-bottom: 0;
+  // border-right: 0;
 
   th {
     background: #ddd;

data/app/models/wco_email/conversation.rb

@@ -30,5 +30,10 @@ class WcoEmail::Conversation
   has_and_belongs_to_many :tags,  class_name: 'Wco::Tag'
   has_and_belongs_to_many :leads, class_name: 'Wco::Lead'
 
+  belongs_to :filter, class_name: 'WcoEmail::EmailFilter', inverse_of: :conversations, optional: true
+
+  def to_s
+    "#{subject} (#{messages.length})"
+  end
 end
 Conv = WcoEmail::Conversation

data/app/models/wco_email/email_filter.rb

@@ -42,5 +42,7 @@ class WcoEmail::EmailFilter
   belongs_to :email_template,        class_name: 'WcoEmail::EmailTemplate',         optional: true
   belongs_to :email_action_template, class_name: 'WcoEmail::EmailActionTemplate',   optional: true
 
+  has_many :conversations, class_name: 'WcoEmail::Conversation', inverse_of: :filter
+
 end
 

data/app/models/wco_email/message.rb

@@ -77,6 +77,7 @@ class WcoEmail::Message
 
   def apply_filter filter
     puts! filter, 'WcoEmail::Message#apply_filter'
+    conv.filter = filter
 
     case filter.kind
 

data/lib/wco_models.rb

@@ -39,3 +39,4 @@ class Wco::HTTParty
 end
 
 ActiveSupport.escape_html_entities_in_json = true
+

metadata

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