ish_models 0.0.33.115 → 0.0.33.120

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2bb4950df8e18100e09baa2335e94d436fd1061980b67a840b2d5579643462e1
-  data.tar.gz: b660b540fc3c8d27843251001e0050d720060ddd0b976faf7f32224d155717e1
+  metadata.gz: ce91e1d5484fed60fbea81719980ce1313604c1c669f9815c1c9a87e5026120e
+  data.tar.gz: cf6223efbb4562388e9948b928481d46008e3ab3276d37321876688a52e08f78
 SHA512:
-  metadata.gz: 0a3f92c4345eeac554acc617c8172aa29b93519a0b8d46f5c5e81e828f2a1f271fe18d0995e1f5d69db4897997a0902760fae06955941e5ea21bb3500fd14653
-  data.tar.gz: b9c9876006707670a5ab236a4def4d61a20bba8235d83cf7901f2d096ae339bd8c62d874cfc4c397d20f30f00ff710ce8df2ef5119907c10a681308b14519bef
+  metadata.gz: 14a5c6b5276806e97e25e656ef6c2be47d89ad4121244361b3f686fc0f37a39358a3324c26142544840709768f3cc4304bd576490ae91fd67adecb8a425b11bd
+  data.tar.gz: f579442e712fa385bb1ddc2c2b95b0dffd21381100f6b45436990cf6b177bfe83c596a042e1685d6c6170e81f8cf8f3786ac3049d710c1d907bca48fd4a2bd64

data/lib/city.rb

@@ -16,7 +16,7 @@ class City
 
   field :deleted_at, type: Time
   def self.all
-    self.where( deleted_at: nil ).order_by( name: :desc )
+    self.where( deleted_at: nil, is_active: true ).order_by( name: :desc )
   end
 
   belongs_to :country, :optional => true
@@ -27,7 +27,7 @@ class City
   has_many :reports
   has_many :venues
   has_many :videos
-  has_many :tags
+  has_and_belongs_to_many :tags
 
   has_many :current_users, :class_name => '::IshModels::UserProfile', :inverse_of => :current_city
   has_many :newsitems
@@ -39,6 +39,7 @@ class City
   embeds_many :features
 
   field :calendar_frame, :type => String
+  field :is_active, type: Boolean, default: true
 
   default_scope ->{ order_by({ :name => :asc }) }
 

data/lib/gallery.rb

@@ -4,6 +4,8 @@ class Gallery
   include ::Mongoid::Document
   include ::Mongoid::Timestamps
 
+  PER_PAGE = 6
+
   field :is_public,  type: Boolean, default: false
   field :is_trash,   type: Boolean, default: false
 
@@ -47,7 +49,7 @@ class Gallery
 
   has_many :photos
 
-  belongs_to :tag,   :optional => true
+  has_and_belongs_to_many :tags
   belongs_to :city,  :optional => true
   belongs_to :venue, :optional => true
 

data/lib/newsitem.rb

@@ -31,6 +31,8 @@ class Newsitem
   field :downvoting_users, :type => Array, :default => []
   field :is_feature,       :type => Boolean, :default => false
 
+  PER_PAGE = 6
+
   default_scope ->{ order_by({ :created_at => :desc }) }
 
   def self.from_params item

data/lib/tag.rb

@@ -16,10 +16,6 @@ class Tag
   
   field :weight, :type => Integer, :default => 10
 
-  has_and_belongs_to_many :reports
-  has_many :galleries
-  has_many :videos
-
   has_many :children_tags, :class_name => 'Tag', :inverse_of => :parent_tag
   belongs_to :parent_tag, :class_name => 'Tag', :inverse_of => :children_tags, :optional => true
 
@@ -31,6 +27,10 @@ class Tag
   belongs_to :city, :optional => true
 
   has_and_belongs_to_many :venues
+  has_and_belongs_to_many :cities
+  has_and_belongs_to_many :galleries
+  has_and_belongs_to_many :reports
+  has_and_belongs_to_many :videos
 
   default_scope ->{
     where({ :is_public => true, :is_trash => false }).order_by({ :name => :asc })

data/lib/venue.rb

@@ -43,6 +43,8 @@ class Venue
   embeds_many :newsitems
   embeds_many :features
 
+  PER_PAGE = 6
+
   def self.list conditions = { :is_trash => false }
     out = self.where( conditions).order_by( :name => :asc )
     [['', nil]] + out.map { |item| [ item.name, item.id ] }

data/lib/video.rb

@@ -22,14 +22,14 @@ class Video
   field :youtube_id, :type => String
   # validates :youtube_id, :uniqueness => true, :presence => true
 
-  belongs_to :tag,  :optional => true
+  has_and_belongs_to_many :tags
   belongs_to :city, :optional => true
   belongs_to :site, :optional => true
-  has_many :newsitems
+  # has_many :newsitems # unnecessary, right? _vp_ 20200412
 
   belongs_to :user_profile, :optional => true, :class_name => 'IshModels::UserProfile', :inverse_of => :videos
 
-  accepts_nested_attributes_for :site, :tag, :city
+  accepts_nested_attributes_for :site, :tags, :city
 
   def self.list
     [['', nil]] + Video.unscoped.order_by( :created_at => :desc ).map { |item| [ "#{item.created_at.strftime('%Y%m%d')} #{item.name}", item.id ] }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_models
 version: !ruby/object:Gem::Version
-  version: 0.0.33.115
+  version: 0.0.33.120
 platform: ruby
 authors:
 - piousbox