ish_models 0.0.33.113 → 0.0.33.114

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f88ffa3b0fdfca2f28fa64cfcab31fa8c68657f19f9f183b681649ad0aad7ebb
-  data.tar.gz: af98d74b680ccc95742195e1a0810828defe53199189fc277ac4c4c35fd8f512
+  metadata.gz: e49713b83fbd5bb64b86dc9e10c6ac33e511ddb182358a65170ed965dd4624d6
+  data.tar.gz: 4e9794e42713365d9067531054ab8c948df7492a4c75f7f767a511e86be3d34e
 SHA512:
-  metadata.gz: 48ceeba355b79e2b22c03967ab98439dce1422b472ccafb57387b11e05f6d1cefbcaeac10ead91ff8d022c633e23c12e2f74e28a856c55287f9dc57fefa17774
-  data.tar.gz: e7c8e20330aebe8fb9047a8f37ebfa9ed8ef7332ab4d4468b2516663aed9ad7bb91edc4eca6fbae65275156efb6b29c3428adcd14e727b1ba4332597d3f38716
+  metadata.gz: '06599160cc8c9d000931f86b8cc921dda3192dc61b57e52ff149dffe62f1ae7980115682209a0559e328f53289f18f86069897f124093245afdb39e363c35e6a'
+  data.tar.gz: b907e1a5e0be37ce44c5c3f3b21103d9e113981aa9fc8e3b9e971e1b39c21b239d0bab4a0bf0e2d93f2bd32da82a2403368f6e204bcdfd5e7605b9db25cb2094

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,7 +16,7 @@ class Tag
   
   field :weight, :type => Integer, :default => 10
 
-  has_many :reports
+  has_and_belongs_to_many :reports
   has_many :galleries
   has_many :videos
 

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