wco_models 3.1.0.77 → 3.1.0.78

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75d573c20e2daa8d9ce98511e31788bef7f389ce4c67ff693e10cbd51062a704
-  data.tar.gz: aace2791f359a233c5ea2c48fb88e84e17fd6c0d0a92dd6a8e2d581f243de576
+  metadata.gz: e0f8f4f03a6fe53303a403050d9ca34e5b81caefda6dbeef36ea5b994643ebe9
+  data.tar.gz: b8b19c8349d9783a54ee8da11db8a414506164216a4e87f9b6cd3f4768eb8f9f
 SHA512:
-  metadata.gz: 55b718c4db30af9bae6c6448337e1195766ab2efbf6d35df0c1a6be1380de61be33f414cbd17610dbee94882d7c7b9329d4510ffd4c4a64ee73633d7c67d38fd
-  data.tar.gz: 8aabf72c5aef2900b195c704ee3875bb31c95ec1cf814f091d09692c9480265cd507ca510e5e48b2e67009b700b83231dc31a6c1ca8778432295155424d8f2a9
+  metadata.gz: 98de670421120a2e745a6af46cecd4238a9528bc0c001a12135469c54e3de70e69222910f8a63a5de3c051953f272685786f5953dd87cb1d03ca490dcb0581fb
+  data.tar.gz: f775ed1e9c82d7464d837c6325fb1b2308436352743bff39617165ebeea1617424929ef69366249fc83376c0eee287aec69b9268e1ba78c2fe649c14a08a6d6e

data/app/models/wco_email/email_filter.rb

@@ -33,12 +33,6 @@ class WcoEmail::EmailFilter
   KINDS = [ nil, KIND_AUTORESPOND_TMPL, KIND_AUTORESPOND_EACT, KIND_ADD_TAG, KIND_REMOVE_TAG, KIND_DESTROY_SCHS]
   field :kind
 
-  STATUS_ACTIVE   = 'active'
-  STATUS_INACTIVE = 'inactive'
-  STATUSES        = [ STATUS_ACTIVE, STATUS_INACTIVE ]
-  field :status, type: :string, default: STATUS_ACTIVE
-  scope :active, ->{ where( status: STATUS_ACTIVE ) }
-
   belongs_to :email_template,        class_name: 'WcoEmail::EmailTemplate',         optional: true
   belongs_to :email_action_template, class_name: 'WcoEmail::EmailActionTemplate',   optional: true
 

data/app/models/wco_email/message_stub.rb

@@ -178,9 +178,9 @@ class WcoEmail::MessageStub
 
 
     ## Actions & Filters
-    email_filters = WcoEmail::EmailFilter.active
+    email_filters = WcoEmail::EmailFilter.all
     email_filters.each do |filter|
-      reson = nil
+      reason = nil
       if filter.from_regex.present? && @message.from.downcase.match( filter.from_regex )
         reason = 'from_regex'
       end
@@ -198,7 +198,7 @@ class WcoEmail::MessageStub
       end
 
       if reason
-        puts! "Applying filter #{filter} to conv #{conv} for matching #{reason}" if DEBUG
+        puts! "Applying filter #{filter} to conv #{@message.conversation} for matching #{reason}" if DEBUG
         @message.apply_filter( filter )
       end
     end

metadata

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