wco_models 3.1.0.195 → 3.1.0.197

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c22cf3c0d0ec7da173c5d3fc82139b5162ce9cc8f6016e962d409ac767e3a73b
-  data.tar.gz: 30606ba3abb75fc7ff474e6f7bfdccc76894bf98e65d33e07fc95316fe36bb4b
+  metadata.gz: df847f3f11917d96587bce5d3b58018c27215956a43a7bf44a34a04966f750b6
+  data.tar.gz: 0c88c176cd9befa80e849bf60b6e69b2d49e79da37fd8377f07a74b1f7a22010
 SHA512:
-  metadata.gz: c6ba50af11cf4290e53d868f5eed7d9e83e965d686d19f2be0c7913a3b38b73e277530bd23ed329121d2e44cdf6f2c711909e893f9dcdef6cdc8d2f24ff1cfe1
-  data.tar.gz: e2b85387f378afc6a981832db68154560de4d60330aeb1f333e60c20a351287ca7749ca8788497a3048dc0880c50e66018d75a00ef7b3470ba8d2a334786a3ae
+  metadata.gz: bd47844f69a043b3cd9ed19db47c8ca52db44568788e4bfefdd14c66d31bdce1f6cd0ea66bc3a526d1bb546d75f50cf35a586ebba25542e94f5d8dfee4239885
+  data.tar.gz: 3a7e32b323db4f08da4b355c9602206c6c2f3a196683f2ef41ca5e274cd5159f17b79fa702981d59d49857a332d733f8d05c2cd227f15c6326f0da8d4c6fb411

data/app/models/wco/gallery.rb

@@ -7,6 +7,7 @@ class Wco::Gallery
   include Wco::Utils
   store_in collection: 'galleries'
 
+  PAGE_PARAM_NAME = 'galleries_page'
 
   field :name
   validates :name, :uniqueness => true

data/app/models/wco/headline.rb

@@ -6,6 +6,8 @@ class Wco::Headline
   include Mongoid::Paranoia
   store_in collection: 'wco_content_headlines'
 
+  PAGE_PARAM_NAME = 'headlines_page'
+
   field :date
   validates :date, presence: true
 

data/app/models/wco/lead.rb

@@ -5,6 +5,8 @@ class Wco::Lead
   include Mongoid::Paranoia
   store_in collection: 'wco_leads'
 
+  PAGE_PARAM_NAME = 'leads_page'
+
   field :email
   validates :email, presence: true, uniqueness: true
   index({ email: -1 }, { unique: true })

data/app/models/wco/leadset.rb

@@ -5,6 +5,8 @@ class Wco::Leadset
   include Mongoid::Paranoia
   store_in collection: 'wco_leadsets'
 
+  PAGE_PARAM_NAME = 'leadsets_page'
+
   field     :company_url
   validates :company_url, presence: true, uniqueness: true
   index({ company_url: 1 }, { unique: true, name: 'company_url' })

data/app/models/wco/report.rb

@@ -9,6 +9,8 @@ class Wco::Report
   include Wco::Utils
   store_in collection: 'wco_reports'
 
+  PAGE_PARAM_NAME = 'reports_page'
+
   field :title
   validates :title, presence: true # , uniqueness: true
   index({ title: 1 }, { unique: true })

data/app/models/wco/video.rb

@@ -9,6 +9,8 @@ class Wco::Video
   include Wco::Utils
   store_in collection: 'videos'
 
+  PAGE_PARAM_NAME = 'videos_page'
+
   field :name, :type => String
   index({ created_at: -1 })
   index({ created_at: -1, name: -1 })

data/app/models/wco_email/conversation.rb

@@ -5,6 +5,8 @@ class WcoEmail::Conversation
   include Mongoid::Paranoia
   store_in collection: 'office_email_conversations'
 
+  PAGE_PARAM_NAME = 'conversations_page'
+
   STATUS_UNREAD = 'status_unread'
   STATUS_READ   = 'status_read'
   STATUSES      = [ STATUS_UNREAD, STATUS_READ ]

data/app/models/wco_email/email_filter.rb

@@ -23,7 +23,7 @@ class WcoEmail::EmailFilter
 
   has_many :actions, class_name: '::WcoEmail::EmailFilterAction', inverse_of: :email_filter
   accepts_nested_attributes_for :actions, allow_destroy: true
-  validate :validate_actions
+  # validate :validate_actions
   def validate_actions
     if actions.length == 0
       errors.add(:actions, 'must be present')
@@ -38,7 +38,7 @@ class WcoEmail::EmailFilter
   has_many :skip_conditions, class_name: '::WcoEmail::EmailFilterCondition', inverse_of: :email_skip_filter
   accepts_nested_attributes_for :skip_conditions, allow_destroy: true
 
-  validate :validate_conditions
+  # validate :validate_conditions
   def validate_conditions
     if conditions.length + skip_conditions.length == 0
       errors.add(:conditions, 'Either conditions or skip conditions must be present.')

data/app/models/wco_email/message_stub.rb

@@ -16,6 +16,8 @@ class WcoEmail::MessageStub
   include Mongoid::Paranoia
   store_in collection: 'wco_email_message_stub'
 
+  PAGE_PARAM_NAME = 'stubs_page'
+
   STATUS_PENDING   = 'status_pending'
   STATUS_PROCESSED = 'status_processed'
   STATUS_FAILED    = 'status_failed'

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

@@ -9,25 +9,25 @@
         <b>Conversations (#{@tag.conversations.length}):&nbsp;</b>
         - if @tag.conversations.present?
           .Conversations
-            = render '/wco_email/conversations/table', convs: @tag.conversations
+            = render '/wco_email/conversations/table', convs: @tag.conversations.page( params[::WcoEmail::Conversation::PAGE_PARAM_NAME] )
       %li.d-flex
         <b>Message Stubs (#{@tag.message_stubs.length}):&nbsp;</b>
-        = render '/wco_email/message_stubs/index', stubs: @tag.message_stubs.page( params[:stubs_page] )
+        = render '/wco_email/message_stubs/index', stubs: @tag.message_stubs.page( params[::WcoEmail::MessageStub::PAGE_PARAM_NAME] )
 
     %li.d-flex
       <b>Galleries (#{@galleries.length}):&nbsp;</b>
-      = render '/wco/galleries/index', galleries: @galleries, config: { skip_tags: true }
+      = render '/wco/galleries/index', galleries: @galleries.page( params[::Wco::Gallery::PAGE_PARAM_NAME] ), config: { skip_tags: true }
     %li.d-flex
       <b>Headlines (#{@tag.headlines.length}):&nbsp;</b>
-      = render '/wco/headlines/index', headlines: @tag.headlines
+      = render '/wco/headlines/index', headlines: @tag.headlines.page( params[::Wco::Headline::PAGE_PARAM_NAME] )
 
     %li.d-flex
       <b>Leadsets (#{@tag.leadsets.length}):&nbsp;</b>
-      = render '/wco/leadsets/index_list', leadsets: @tag.leadsets
+      = render '/wco/leadsets/index_list', leadsets: @tag.leadsets.page( params[::Wco::Leadset::PAGE_PARAM_NAME] )
     %li.d-flex
       <b>Leads (#{@tag.leads.length}):&nbsp;</b>
-      = render '/wco/leads/index', leads: @tag.leads
+      = render '/wco/leads/index', leads: @tag.leads.page( params[::Wco::Lead::PAGE_PARAM_NAME] )
 
     %li.d-flex
       <b>Reports (#{@reports.length}):&nbsp;</b>
-      = render '/wco/reports/index', reports: @reports, config: { skip_tags: true }
+      = render '/wco/reports/index', reports: @reports.page( params[::Wco::Report::PAGE_PARAM_NAME] ), config: { skip_tags: true }

metadata

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