ishapi 0.1.8.17 → 0.1.8.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae3828b157640356896379ff1249c5522a5a726e
-  data.tar.gz: 5207b80b7dff7969088deeefcf658ddb957e54c1
+  metadata.gz: 44cdbd0807f0ade66812f732c0c5c0ba86e455f8
+  data.tar.gz: 12b037c0dc04457f45b44e3df35e7698a14bef5a
 SHA512:
-  metadata.gz: b1f2fd2c999ce138c68f89eb47edaf4390ddd99585ef8e84e0baecd7e34a3ae15c0916ccfedb653365f01aafc46bfee62c6ca79d63d9fe4b570ac8875260a4e8
-  data.tar.gz: c102ffde5d23f1c224a4620a303a4283a9044fcf0c0345980db429578bf729263c89580e9f71cf26e5b9f91548e1783ba8769251bab8c3400f8844765b21ab74
+  metadata.gz: 3fb84c18de49f30520f1e004e1c84d49be89f966e549ec70c204eac982d75a4bcf81de7abcafeec51af30abe13cc5da339946c658260d79068f91e2911a5b139
+  data.tar.gz: 78991d63c24eef1938d3d071bb4bd83042a699b8afc9355293238e1655cb1371c4b3aab6d531e97afe7abe881b4dd5ecb5da0eba8a3749b7c800e7352e678b7b

data/app/controllers/ishapi/galleries_controller.rb

@@ -2,6 +2,15 @@ require_dependency "ishapi/application_controller"
 module Ishapi
   class GalleriesController < ApplicationController
 
+    def index
+      @galleries = Gallery.all
+      authorize! :index, Gallery
+      if params[:cityname]
+        city = City.find_by :cityname => params[:cityname]
+        @galleries = @galleries.where( :city => city )
+      end
+    end
+
     def show
       @gallery = ::Gallery.unscoped.find_by :galleryname => params[:galleryname]
       authorize! :show, @gallery

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

@@ -10,6 +10,7 @@ json.cache! key do
     json.name        @city.name
     json.cityname    @city.cityname
     json.description @city.description
+    json.photo       @city.profile_photo.photo.url( :thumb ) if @city.profile_photo
     json.x           @city.x
     json.y           @city.y
 

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

@@ -0,0 +1,15 @@
+
+#
+# ishapi / galleries / index
+#
+
+json.array! @galleries do |gallery|
+  json.id          gallery.id.to_s
+  json.name        gallery.name
+  json.galleryname gallery.galleryname
+  json.username    gallery.username
+  json.cityname    gallery.city.name    if gallery.city
+  json.tagname     gallery.tag.name_seo if gallery.tag
+  json.venuename   gallery.venue.name   if gallery.venue
+end
+

data/app/views/ishapi/galleries/index.jbuilder~

@@ -0,0 +1,2 @@
+
+json.a 'b'

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

@@ -10,5 +10,11 @@ json.cache! key do
     json.name        @report.name
     json.reportname  @report.name_seo
     json.description @report.descr
+
+    # @TODO: move this to meta
+    json.cityname @report.city.cityname if @report.city
+    json.username @report.username
+    json.tagname  @report.tag.name_seo  if @report.tag
+
   end
 end

data/config/routes.rb

@@ -6,6 +6,7 @@ Ishapi::Engine.routes.draw do
   get 'cities',                :to => 'cities#index'
   get 'cities/view/:cityname', :to => 'cities#show'
 
+  get 'galleries',                   :to => 'galleries#index'
   get 'galleries/view/:galleryname', :to => 'galleries#show'
 
   namespace :my do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.17
+  version: 0.1.8.18
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-05 00:00:00.000000000 Z
+date: 2017-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -167,6 +167,8 @@ files:
 - app/views/ishapi/galleries/_index.jbuilder~
 - app/views/ishapi/galleries/_show.jbuilder
 - app/views/ishapi/galleries/_show.jbuilder~
+- app/views/ishapi/galleries/index.jbuilder
+- app/views/ishapi/galleries/index.jbuilder~
 - app/views/ishapi/galleries/show.jbuilder
 - app/views/ishapi/galleries/show.jbuilder~
 - app/views/ishapi/my/reports/index.jbuilder