ish_models 0.0.33.114 → 0.0.33.119

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e49713b83fbd5bb64b86dc9e10c6ac33e511ddb182358a65170ed965dd4624d6
-  data.tar.gz: 4e9794e42713365d9067531054ab8c948df7492a4c75f7f767a511e86be3d34e
+  metadata.gz: 29c1520c5fc6a0d4d621ed6240c77a00b9cf879e4f31b188383eeebdde7b0f24
+  data.tar.gz: 2f0c0b4b9f30333aa370b82634bb4f428583109386664e0ce09f7db24c04468f
 SHA512:
-  metadata.gz: '06599160cc8c9d000931f86b8cc921dda3192dc61b57e52ff149dffe62f1ae7980115682209a0559e328f53289f18f86069897f124093245afdb39e363c35e6a'
-  data.tar.gz: b907e1a5e0be37ce44c5c3f3b21103d9e113981aa9fc8e3b9e971e1b39c21b239d0bab4a0bf0e2d93f2bd32da82a2403368f6e204bcdfd5e7605b9db25cb2094
+  metadata.gz: 7d8516841d633e40b2e9158c073e19d5e13c547fab4d9b2b20e8402955958e82f853f99c8424779d27244eb3d83ac12a8835af31d1b3b5349bdb116fdc41b724
+  data.tar.gz: 9ed78769aa53818df64028f2fc52460a141e135a8d6dd61520bce73c366b71846d3f1fa4c70930c3d56762a76ed88780c76c70552a59a786e788d7f2450b69e1

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
 
   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.114
+  version: 0.0.33.119
 platform: ruby
 authors:
 - piousbox