wco_models 3.1.0.52 → 3.1.0.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ae41306d1c2d1a86acdc705f296feae8ba6cb9d31dcef4c1794cabaa69d8b2c
-  data.tar.gz: 1d34eb80dc069bb504a62a08ee25da17c92cebb5805399ff570954c8bd163c3e
+  metadata.gz: 7e600845398a0cd10bcd4683dfd01a7f3793ba4b1dc9e086df508d1845fc8127
+  data.tar.gz: a8f500decf7e7f67716cdcf3e53231239bedb36e3ee8098a0a27063ef80068f9
 SHA512:
-  metadata.gz: 46d410929c0405cffbd123b8b376a3629fc748e75df699b56bd94d70b9576c22c09358e64c32f3bfea59fc6b1bd7ed471cb70af2c9c4cd60170b75599df4a0d6
-  data.tar.gz: 5b7280694b1ba7790c33e70e1f0c8555733f6d2912e7af2bdaba73516adfe6417e1594384ca84896cf1d7b6ea3f9cdd1dcf419188f38dd19f0fc69ce1f20a37c
+  metadata.gz: a5649ea010caf2ecba1b71bfdd800f4674320a5c36ac95c7aab2f0b9266d19eedfbb37ed3a91785c9e4bc8a80c4aeccc848e3709018d81c3bc427ddee740dbde
+  data.tar.gz: 8a7e153a876fe7f28c411c056e838f08e204f1d4647add4a72c68718474b8dc971af71105d7cd455bb4934b43a62560f752e29da1ac4d8f1f12475718f074cf0

data/app/models/wco/gallery.rb

@@ -7,23 +7,24 @@ class Wco::Gallery
   include Wco::Utils
   store_in collection: 'galleries'
 
-  PER_PAGE = 6
 
   field :name
   validates :name, :uniqueness => true
   index({ :name => -1 }) ## 2023-09-23 removed uniqueness
 
+  field :slug
+  index({ :slug => -1 }, { :unique => true })
+  validates :slug, presence: true, uniqueness: true
+  before_validation :set_slug, :on => :create
+
   field :subhead
   field :descr,   :as => :description
 
   field :is_public, type: Boolean, default: false
   # has_and_belongs_to_many :shared_profiles, :class_name => 'Wco::Profile', :inverse_of => :shared_galleries
 
-  field :is_trash,   type: Boolean, default: false
-  field :is_done,    type: Boolean, default: false
-
   def published
-    where({ :is_public => true, :is_trash => false }).order_by({ :created_at => :desc })
+    where({ :is_public => true }).order_by({ :created_at => :desc })
   end
 
   field :x,       :type => Float
@@ -31,15 +32,9 @@ class Wco::Gallery
   field :z,       :type => Float
 
   field :lang,    :default => 'en'
-  # field :username
-  # field :lead_id, type: :integer
 
-  field :slug
-  index({ :slug => -1 }, { :unique => true })
-  validates :slug, presence: true, uniqueness: true
-  before_validation :set_slug, :on => :create
 
-  def self.list conditions = { :is_trash => false }
+  def self.list conditions = {}
     out = self.unscoped.where( conditions ).order_by( :created_at => :desc )
     [['', nil]] + out.map { |item| [ "#{item.created_at.strftime('%Y%m%d')} #{item.name}", item.id ] }
   end

data/app/models/wco/photo.rb

@@ -51,14 +51,10 @@ class Wco::Photo
                             s3_region: ::S3_CREDENTIALS[:region]
   validates_attachment_content_type :photo, :content_type => ["image/webp", "image/jpg", "image/jpeg", "image/png", "image/gif", 'application/octet-stream' ]
 
-  def self.n_per_manager_gallery
-    25
-  end
-
   def export_fields
     %w|
       gallery_id
-      name descr weight is_public is_trash
+      name descr weight
 
       photo_file_name photo_content_type photo_file_size photo_updated_at photo_fingerprint
     |

metadata

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