ishapi 0.1.8.53 → 0.1.8.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b62f4c9e48fbdace0290ac3548dea0ee7c95e0d2
-  data.tar.gz: 72e101241e6e8be73e6b3c5adcfe9ed0f993319f
+  metadata.gz: 183ed41578658cfbf4c05b46e2e4f415044e1f6a
+  data.tar.gz: ce53db992cb8fce63be8af00c4161e10e4c186b0
 SHA512:
-  metadata.gz: 0aa6eed78a9ba44ae37032f9b42fd4a5fe9efb2933346c87319fee34a3a1f2cc4fa4ac25763f8065b27f47bad24e5ce99c06319259f02e8c39cca841094213de
-  data.tar.gz: f93bfcf69162647fc2a92d74d1cca173d10e44f1c3622dc40e429cef460ff38ba931a6c360c8470b192360a9e03d6e8de1c8dbc7804b39d5bee0d283513f5993
+  metadata.gz: 1462a727f8980131b9fb84bd94c422456a3057894474c835f1c1ffc8bb9c11875b0190071f5cc55934ae4347f0fa7309019c3f10b6649e5b6d33fac2638976f7
+  data.tar.gz: 1385f7170798ccc196f6075e995097b71cadcd7721ecfeb746321b1f1e6e65ba9bd91f8f69ad92752724a6cee62b62f70476b105d61730cfc45ed05a8c51d533

data/app/controllers/ishapi/sites_controller.rb

@@ -16,7 +16,9 @@ module Ishapi
       @site = ::Site.find_by :domain => domain, :lang => :en
       authorize! :show, @site
 
+      @galleries = @site.galleries.limit( 10 )
       @newsitems = @site.newsitems.limit(10)
+      @reports   = @site.reports.limit( 10 )
       @langs = ::Site.where( :domain => domain ).map( &:lang )
     end
 

data/app/controllers/ishapi/videos_controller.rb

@@ -0,0 +1,26 @@
+require_dependency "ishapi/application_controller"
+module Ishapi
+  class VideosController < ApplicationController
+
+    def show
+      @video = Video.unscoped.find_by :name_seo => params[:name_seo]
+      authorize! :show, @video
+    end
+
+    def index
+      authorize! :index, Video
+      @videos = Video.all
+      if params[:cityname]
+        city = City.find_by :cityname => params[:cityname]
+        @videos = @videos.where( :city_id => city.id )
+      end
+      if params[:domain]
+        site = Site.find_by :domain => params[:domain], :lang => :en
+        @videos = @videos.where( :site_id => site.id )
+      end
+
+      @videos = @videos.page( params[:videos_page] ).per( 10 )
+    end
+
+  end
+end

data/app/models/ishapi/ability.rb

@@ -50,5 +50,9 @@ class Ishapi::Ability
     can [ :show ], Venue do |venue|
       venue.is_public
     end
+    can [ :index ], Video
+    can [ :show ], Video do |video|
+      video.is_public
+    end
   end
 end

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

@@ -5,7 +5,6 @@
 
 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
@@ -16,3 +15,4 @@ json.array! @reports do |report|
   end
 end
 
+

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

@@ -18,7 +18,7 @@ json.cache! key do
     # @TODO: move this to meta
     json.created_at  @report.created_at.strftime('%Y%m%d')
     json.updated_at  @report.updated_at.strftime('%Y%m%d')
-    json.username    @report.user_profile.name
+    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
 

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

@@ -18,7 +18,10 @@ json.cache! key do
     json.newsitems_per_page     @site.newsitems_per_page
 
     json.partial! 'ishapi/features/index',  :features  => @site.features, :resource => @site
-    json.partial! 'ishapi/newsitems/index', :newsitems => @newsitems
+    json.partial! 'ishapi/galleries/index', :galleries => @galleries,     :resource => @site
+    json.partial! 'ishapi/newsitems/index', :newsitems => @newsitems,     :resource => @site
+    json.partial! 'ishapi/reports/index',   :reports   => @reports,       :resource => @site
     json.partial! 'ishapi/videos/index',    :videos    => @site.videos
+    
   end
 end

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

@@ -4,6 +4,8 @@
 #
 
 json.n_videos videos.count
-json.videos videos do |video|
-  json.partial! 'ishapi/videos/show', :video => video
+json.videos do
+  json.array! videos do |video|
+    json.partial! 'ishapi/videos/show', :video => video
+  end
 end

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

@@ -0,0 +1,3 @@
+
+
+json.partial! 'ishapi/videos/index', :videos => @videos

data/config/routes.rb

@@ -48,4 +48,6 @@ Ishapi::Engine.routes.draw do
   get 'venues', :to => 'venues#index'
   get 'venues/view/:venuename', :to => 'venues#show'
  
+  resources :videos
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.53
+  version: 0.1.8.54
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-26 00:00:00.000000000 Z
+date: 2017-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -192,6 +192,7 @@ files:
 - app/controllers/ishapi/users_controller.rb~
 - app/controllers/ishapi/venues_controller.rb
 - app/controllers/ishapi/venues_controller.rb~
+- app/controllers/ishapi/videos_controller.rb
 - app/helpers/ishapi/application_helper.rb
 - app/helpers/ishapi/articles_helper.rb
 - app/jobs/ishapi/application_job.rb
@@ -254,6 +255,7 @@ files:
 - app/views/ishapi/videos/_index.jbuilder~
 - app/views/ishapi/videos/_show.jbuilder
 - app/views/ishapi/videos/_show.jbuilder~
+- app/views/ishapi/videos/index.jbuilder
 - app/views/layouts/ishapi/application.html.erb
 - config/initializers/koala.rb
 - config/routes.rb