ishapi 0.1.8.120 → 0.1.8.121

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a5914840d2a0f91b63f460d9f578d0f503b98db04038b6578fc4acf696233f4
-  data.tar.gz: 2c494403cefa3ef9543ca3087f5b183d7564cf8689ea31bbd153146fde3df036
+  metadata.gz: c2453a341a440c8cb3727b7a73ba5146b6d6c01337d367a9544d0527e9e61ee5
+  data.tar.gz: ac6d01a71082f916f14142805193e826f7f2061771700ccbdd4e0c9bce631d84
 SHA512:
-  metadata.gz: 9158352265eb0a352fa8ab12b9e7aa59ac2d21fb67c0203c87c6d8aa99f790999c4e6cbbaea0af150c4223efeb41b13b23a43c1f1361bd1f2f1720f77cdb1793
-  data.tar.gz: f57305a13ebc7996fef660194d53d48504a8780497fc6f3a8023f985ecd2d27923103e26c89a906425a82692f350702ffa6eea2bf7e6fd05a3179b2406466b31
+  metadata.gz: 242df957ea7b5653dc9bb5278fa453b3651f1aa467acd6d1215588bc43212305313e605cc7d83c18efa16472a1261a5e9b6ee221a221bcc2ab01a783ca3ca71d
+  data.tar.gz: 52fe8fc4b4cfc2bea379f42297e7c7dea5828e1adfb4680a008891b9fa699bd2d290705f3b02f67568d00d1180da6c5d6b6597e4784772fff4dd46c0869a6fa7

data/app/controllers/ishapi/reports_controller.rb

@@ -19,6 +19,11 @@ module Ishapi
         @reports = @reports.where( :site_id => site.id )
       end
 
+      if params[:tag]
+        tag = Tag.find_by(:name => params[:tag])
+        @reports = @reports.where(:tag_ids => tag)
+      end
+
       @reports = @reports.page( params[:reports_page] ).per( 10 )
     end
 

data/app/views/ishapi/reports/_index.jbuilder

@@ -6,10 +6,10 @@
 json.n_reports reports.count
 json.reports do
   json.array! reports do |report|
-    json.id          report.id.to_s
+    # json.id          report.id.to_s
     json.created_at  report.created_at
     json.name        report.name
-    json.reportname  report.name_seo
+    json.slug        report.name_seo
     json.description report.descr
 
     if report.photo
@@ -20,5 +20,7 @@ json.reports do
       end
     end
 
+    json.partial! 'ishapi/tags/index', tags: report.tags unless report.tags.blank?
+
   end
 end

data/app/views/ishapi/reports/index.jbuilder

@@ -3,21 +3,4 @@
 # ishapi / reports / index.jbuilder
 #
 
-json.array! @reports do |report|
-  json.created_at  report.created_at
-  json.id          report.id.to_s
-  json.name        report.name
-  json.reportname  report.name_seo
-  json.subhead     report.subhead
-  json.description report.descr
-  if report.photo
-    json.photo      report.photo.photo.url( :thumb ) # @deprecated 20180417
-    json.photos do
-      json.thumb_url report.photo.photo.url( :thumb )
-      json.small_url report.photo.photo.url( :small )
-      json.large_url report.photo.photo.url( :large )
-    end
-  end
-end
-
-
+json.partial! 'ishapi/reports/index', reports: @reports

data/app/views/ishapi/reports/show.jbuilder

@@ -20,8 +20,6 @@ json.cache! key do
     json.updated_at  @report.updated_at
     json.username    @report.user_profile.name if @report.user_profile
     json.cityname    @report.city.cityname if @report.city
-    json.tagname     @report.tag.name_seo  if @report.tag
-
     json.subhead     @report.subhead
     json.description @report.descr
   
@@ -32,6 +30,8 @@ json.cache! key do
         json.large_url @report.photo.photo.url :large
       end
     end
+
+    json.partial! 'ishapi/tags/index',   :tags   => @report.tags
   end
 
   # @deprecated, but specs use this _vp_ 20180423

data/app/views/ishapi/tags/_index.jbuilder

@@ -1,11 +1,12 @@
 
-#
-# ishapi / tags / _index
-#
+##
+## ishapi / tags / _index
+##
 
+# json.n_tags tags.count
 json.tags do
   json.array! tags do |tag|
-    json.id          tag.id.to_s
+    # json.id          tag.id.to_s
     json.name        tag.name
     json.name_seo    tag.name_seo
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.120
+  version: 0.1.8.121
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-29 00:00:00.000000000 Z
+date: 2020-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails