ish_models 0.0.33.116 → 0.0.33.117

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f09269340d4d6c43b23eb5a247f31f95e10290cfee4e9a981b126cd7e7cddaee
-  data.tar.gz: 6715248105e5d4ba8d9e6ef974a0100fa652bfb1535255ed1d3aa917697106aa
+  metadata.gz: ef4f46d4145fd56550698161657af3b3cf77e907536157eddccd58133c6d12d1
+  data.tar.gz: 2fcc853c11188b83ccd9af5a0895cb50d3c16672616b12eee7ef280c00c77d2b
 SHA512:
-  metadata.gz: 7339a428e96136098e4be1555a0e9165b63da47dec007eeac7ed5dd42da54446d86c432cdf4b942112f47269b8ddb217fc4116ebdeefbf67b0f5eb86b7f53f8e
-  data.tar.gz: 217a2df35598decbe933e7eb6485db97fb792f76061f271682007d02d6616ebccac87eb4dbaa2b58fa6ac6183b7112dd7d28e12a59550e6b07372a3f3d2cdcf0
+  metadata.gz: f141fe8dccd35cc165fac199bff8516cb26660fb2c811dc1f69c3b98d2e81235d435e5827d519b936bc8ae1dd891bdc96296219c63e9b61ffa3055bea3c12eaf
+  data.tar.gz: 8aa13dde8022284a104458002cd404cec31ea5181656256bdb08cf186892dc09b48ee985239e32b66ce668c313951d32dd574577cf40c07f466544f6abce01c0

data/lib/city.rb

@@ -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

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/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 })

metadata

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