ishapi 0.1.8.120 → 0.1.8.121
Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c2453a341a440c8cb3727b7a73ba5146b6d6c01337d367a9544d0527e9e61ee5
|
4
|
+
data.tar.gz: ac6d01a71082f916f14142805193e826f7f2061771700ccbdd4e0c9bce631d84
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 242df957ea7b5653dc9bb5278fa453b3651f1aa467acd6d1215588bc43212305313e605cc7d83c18efa16472a1261a5e9b6ee221a221bcc2ab01a783ca3ca71d
|
7
|
+
data.tar.gz: 52fe8fc4b4cfc2bea379f42297e7c7dea5828e1adfb4680a008891b9fa699bd2d290705f3b02f67568d00d1180da6c5d6b6597e4784772fff4dd46c0869a6fa7
|
@@ -19,6 +19,11 @@ module Ishapi
|
|
19
19
|
@reports = @reports.where( :site_id => site.id )
|
20
20
|
end
|
21
21
|
|
22
|
+
if params[:tag]
|
23
|
+
tag = Tag.find_by(:name => params[:tag])
|
24
|
+
@reports = @reports.where(:tag_ids => tag)
|
25
|
+
end
|
26
|
+
|
22
27
|
@reports = @reports.page( params[:reports_page] ).per( 10 )
|
23
28
|
end
|
24
29
|
|
@@ -6,10 +6,10 @@
|
|
6
6
|
json.n_reports reports.count
|
7
7
|
json.reports do
|
8
8
|
json.array! reports do |report|
|
9
|
-
json.id report.id.to_s
|
9
|
+
# json.id report.id.to_s
|
10
10
|
json.created_at report.created_at
|
11
11
|
json.name report.name
|
12
|
-
json.
|
12
|
+
json.slug report.name_seo
|
13
13
|
json.description report.descr
|
14
14
|
|
15
15
|
if report.photo
|
@@ -20,5 +20,7 @@ json.reports do
|
|
20
20
|
end
|
21
21
|
end
|
22
22
|
|
23
|
+
json.partial! 'ishapi/tags/index', tags: report.tags unless report.tags.blank?
|
24
|
+
|
23
25
|
end
|
24
26
|
end
|
@@ -3,21 +3,4 @@
|
|
3
3
|
# ishapi / reports / index.jbuilder
|
4
4
|
#
|
5
5
|
|
6
|
-
json.
|
7
|
-
json.created_at report.created_at
|
8
|
-
json.id report.id.to_s
|
9
|
-
json.name report.name
|
10
|
-
json.reportname report.name_seo
|
11
|
-
json.subhead report.subhead
|
12
|
-
json.description report.descr
|
13
|
-
if report.photo
|
14
|
-
json.photo report.photo.photo.url( :thumb ) # @deprecated 20180417
|
15
|
-
json.photos do
|
16
|
-
json.thumb_url report.photo.photo.url( :thumb )
|
17
|
-
json.small_url report.photo.photo.url( :small )
|
18
|
-
json.large_url report.photo.photo.url( :large )
|
19
|
-
end
|
20
|
-
end
|
21
|
-
end
|
22
|
-
|
23
|
-
|
6
|
+
json.partial! 'ishapi/reports/index', reports: @reports
|
@@ -20,8 +20,6 @@ json.cache! key do
|
|
20
20
|
json.updated_at @report.updated_at
|
21
21
|
json.username @report.user_profile.name if @report.user_profile
|
22
22
|
json.cityname @report.city.cityname if @report.city
|
23
|
-
json.tagname @report.tag.name_seo if @report.tag
|
24
|
-
|
25
23
|
json.subhead @report.subhead
|
26
24
|
json.description @report.descr
|
27
25
|
|
@@ -32,6 +30,8 @@ json.cache! key do
|
|
32
30
|
json.large_url @report.photo.photo.url :large
|
33
31
|
end
|
34
32
|
end
|
33
|
+
|
34
|
+
json.partial! 'ishapi/tags/index', :tags => @report.tags
|
35
35
|
end
|
36
36
|
|
37
37
|
# @deprecated, but specs use this _vp_ 20180423
|
@@ -1,11 +1,12 @@
|
|
1
1
|
|
2
|
-
|
3
|
-
|
4
|
-
|
2
|
+
##
|
3
|
+
## ishapi / tags / _index
|
4
|
+
##
|
5
5
|
|
6
|
+
# json.n_tags tags.count
|
6
7
|
json.tags do
|
7
8
|
json.array! tags do |tag|
|
8
|
-
json.id tag.id.to_s
|
9
|
+
# json.id tag.id.to_s
|
9
10
|
json.name tag.name
|
10
11
|
json.name_seo tag.name_seo
|
11
12
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: ishapi
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.8.
|
4
|
+
version: 0.1.8.121
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- piousbox
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2020-
|
11
|
+
date: 2020-03-01 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|