wco_models 3.1.0.75 → 3.1.0.76

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7ac0ff430c81efd11aced2ffa36e17bd8aebdad6e337ea3ef981adbe6154e35b
4
- data.tar.gz: bc47f58cbac8d53afd585068c2f2de34768176a268126b1f05779c8cda55ec68
3
+ metadata.gz: ce2fdb73b44011dfcb8d9805e54ca598aefa78f7912afab54aa855d4e02a4707
4
+ data.tar.gz: 7c3689e7460ee1ada0ee293417f72d4c860c1360d7d35ac03c4990bbfaf421f5
5
5
  SHA512:
6
- metadata.gz: b2b311cab305457585ca0a98e9f8381537747a3c2d6b5b407be0c8c0d88615b13292e6849118d81bc16cb30116b20a8a3b65b12f5fd9edb3a91512489333d84e
7
- data.tar.gz: f4484697303ebf15d0f39b35f835911c01ea812336d14ba833d0df4ca7de4fb3ac9b53313cdd328e81c234c64b162c8209d928f6d0952cef7a17b5cec9f5e914
6
+ metadata.gz: 302daada8d9b6344abe54308ca9532a15588f4463c5218cbff9aecd73df1d8d76d4653c612cddf70e4120814a4cd7d432141d488fa75e5e8d9f383b9a0d278e0
7
+ data.tar.gz: 63d7c4e56bee07d53c0c9e390bea15b3307a2339b8e633d72cb72c4c2b4e33b061706b5e9fa73ac955a4dc69cf0aa26adf503eee720507bcf3dbe2a08335fd81
@@ -35,12 +35,12 @@ textarea {
35
35
 
36
36
  table.bordered {
37
37
  table-layout:fixed;
38
- width: 100%;
38
+ width: auto; // 100%;
39
39
  word-wrap: break-word;
40
40
 
41
41
  border: 1px solid gray;
42
- border-bottom: 0;
43
- border-right: 0;
42
+ // border-bottom: 0;
43
+ // border-right: 0;
44
44
 
45
45
  th {
46
46
  background: #ddd;
@@ -30,5 +30,10 @@ class WcoEmail::Conversation
30
30
  has_and_belongs_to_many :tags, class_name: 'Wco::Tag'
31
31
  has_and_belongs_to_many :leads, class_name: 'Wco::Lead'
32
32
 
33
+ belongs_to :filter, class_name: 'WcoEmail::EmailFilter', inverse_of: :conversations, optional: true
34
+
35
+ def to_s
36
+ "#{subject} (#{messages.length})"
37
+ end
33
38
  end
34
39
  Conv = WcoEmail::Conversation
@@ -42,5 +42,7 @@ class WcoEmail::EmailFilter
42
42
  belongs_to :email_template, class_name: 'WcoEmail::EmailTemplate', optional: true
43
43
  belongs_to :email_action_template, class_name: 'WcoEmail::EmailActionTemplate', optional: true
44
44
 
45
+ has_many :conversations, class_name: 'WcoEmail::Conversation', inverse_of: :filter
46
+
45
47
  end
46
48
 
@@ -77,6 +77,7 @@ class WcoEmail::Message
77
77
 
78
78
  def apply_filter filter
79
79
  puts! filter, 'WcoEmail::Message#apply_filter'
80
+ conv.filter = filter
80
81
 
81
82
  case filter.kind
82
83
 
data/lib/wco_models.rb CHANGED
@@ -39,3 +39,4 @@ class Wco::HTTParty
39
39
  end
40
40
 
41
41
  ActiveSupport.escape_html_entities_in_json = true
42
+
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: wco_models
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.0.75
4
+ version: 3.1.0.76
5
5
  platform: ruby
6
6
  authors:
7
7
  - Victor Pudeyev