ish_models 0.0.33.113 → 0.0.33.118

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f88ffa3b0fdfca2f28fa64cfcab31fa8c68657f19f9f183b681649ad0aad7ebb
-  data.tar.gz: af98d74b680ccc95742195e1a0810828defe53199189fc277ac4c4c35fd8f512
+  metadata.gz: 121558953571ec7ddccd7fa69e5fc6ac7ae66fb854bf3c3af7a6e863c081d7ef
+  data.tar.gz: cd512a1f08541937604d4271331f37f08b0612a294ee87b58bc340bc0a8826de
 SHA512:
-  metadata.gz: 48ceeba355b79e2b22c03967ab98439dce1422b472ccafb57387b11e05f6d1cefbcaeac10ead91ff8d022c633e23c12e2f74e28a856c55287f9dc57fefa17774
-  data.tar.gz: e7c8e20330aebe8fb9047a8f37ebfa9ed8ef7332ab4d4468b2516663aed9ad7bb91edc4eca6fbae65275156efb6b29c3428adcd14e727b1ba4332597d3f38716
+  metadata.gz: 6d45ea857448f205f82ee8f3a26b8c758781595ad919ae7befd4bd142744d0806ae0d463abfe5fb591c9cf893bb589d5e3ae3979392eeb3962b3e635c5457b4e
+  data.tar.gz: ae1f643f25fe548a4dd733f888801373a5e9512e42f6f5e7766c2326114b48510d3658a6ad87e0779c53ac57616cb5ba2d53d4481f5e813e06daeeef4706991e

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

@@ -47,7 +47,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/report.rb

@@ -1,4 +1,4 @@
-class Report   
+class Report
   include ::Mongoid::Document
   include ::Mongoid::Timestamps
 
@@ -44,11 +44,11 @@ class Report
   field :issue
   field :subhead
   
-  belongs_to :tag,         :optional => true
   belongs_to :city,        :optional => true
   belongs_to :site,        :optional => true
   belongs_to :cities_user, :optional => true
 
+  has_and_belongs_to_many :tags
   has_and_belongs_to_many :venues
   
   has_one :photo
@@ -81,13 +81,13 @@ class Report
   end
   
   def self.not_tagged
-    Report.where( :tag_id => nil, :city => nil )
+    Report.where( :tag_ids => nil, :city => nil )
   end
   
   def self.for_homepage args
     begin
       tag_ids = args[:main_tag].children_tags.map { |tag| tag._id } + [ args[:main_tag]._id ]
-      return Report.where( :tag_id.in => tag_ids ).page args[:page]
+      return Report.where( :tag_ids.in => tag_ids ).page args[:page]
     rescue
       return Report.page args[:page]  
     end
@@ -138,10 +138,6 @@ class Report
     end
   end
 
-  def self.not_tagged
-    Report.where( :tag_id => nil, :city => nil )
-  end
-
   def venue
     self.venues[0] || nil
   end

data/lib/tag.rb

@@ -16,10 +16,6 @@ class Tag
   
   field :weight, :type => Integer, :default => 10
 
-  has_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/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.113
+  version: 0.0.33.118
 platform: ruby
 authors:
 - piousbox