ish_models 0.0.33.113 → 0.0.33.114
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/report.rb +4 -8
- data/lib/tag.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e49713b83fbd5bb64b86dc9e10c6ac33e511ddb182358a65170ed965dd4624d6
|
|
4
|
+
data.tar.gz: 4e9794e42713365d9067531054ab8c948df7492a4c75f7f767a511e86be3d34e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: '06599160cc8c9d000931f86b8cc921dda3192dc61b57e52ff149dffe62f1ae7980115682209a0559e328f53289f18f86069897f124093245afdb39e363c35e6a'
|
|
7
|
+
data.tar.gz: b907e1a5e0be37ce44c5c3f3b21103d9e113981aa9fc8e3b9e971e1b39c21b239d0bab4a0bf0e2d93f2bd32da82a2403368f6e204bcdfd5e7605b9db25cb2094
|
data/lib/report.rb
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
class Report
|
|
1
|
+
class Report
|
|
2
2
|
include ::Mongoid::Document
|
|
3
3
|
include ::Mongoid::Timestamps
|
|
4
4
|
|
|
@@ -44,11 +44,11 @@ class Report
|
|
|
44
44
|
field :issue
|
|
45
45
|
field :subhead
|
|
46
46
|
|
|
47
|
-
belongs_to :tag, :optional => true
|
|
48
47
|
belongs_to :city, :optional => true
|
|
49
48
|
belongs_to :site, :optional => true
|
|
50
49
|
belongs_to :cities_user, :optional => true
|
|
51
50
|
|
|
51
|
+
has_and_belongs_to_many :tags
|
|
52
52
|
has_and_belongs_to_many :venues
|
|
53
53
|
|
|
54
54
|
has_one :photo
|
|
@@ -81,13 +81,13 @@ class Report
|
|
|
81
81
|
end
|
|
82
82
|
|
|
83
83
|
def self.not_tagged
|
|
84
|
-
Report.where( :
|
|
84
|
+
Report.where( :tag_ids => nil, :city => nil )
|
|
85
85
|
end
|
|
86
86
|
|
|
87
87
|
def self.for_homepage args
|
|
88
88
|
begin
|
|
89
89
|
tag_ids = args[:main_tag].children_tags.map { |tag| tag._id } + [ args[:main_tag]._id ]
|
|
90
|
-
return Report.where( :
|
|
90
|
+
return Report.where( :tag_ids.in => tag_ids ).page args[:page]
|
|
91
91
|
rescue
|
|
92
92
|
return Report.page args[:page]
|
|
93
93
|
end
|
|
@@ -138,10 +138,6 @@ class Report
|
|
|
138
138
|
end
|
|
139
139
|
end
|
|
140
140
|
|
|
141
|
-
def self.not_tagged
|
|
142
|
-
Report.where( :tag_id => nil, :city => nil )
|
|
143
|
-
end
|
|
144
|
-
|
|
145
141
|
def venue
|
|
146
142
|
self.venues[0] || nil
|
|
147
143
|
end
|
data/lib/tag.rb
CHANGED