ish_manager 0.1.8.228 → 0.1.8.233

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bcf03d88d7f1af8455dc7bc3ce17fce365eeb95d9fbc7ed16168122557035dc
-  data.tar.gz: 61ddd32c62730cb184b02f859247ad1e9c147fd6b7d7d9e71ad9740c809b01e1
+  metadata.gz: f17a92c8d618a6bd6319320ee036ecbe43d8926630f1a077cc91e963507dcb4b
+  data.tar.gz: 601a974e35562b98b15ebad0fb307e7b9f557d687bc17977ad2268c10e4f9192
 SHA512:
-  metadata.gz: 400f1b581a783e233e6fb37e26a19c4945b411992a7b5ed8634d3db44770a79122d2f2c29e889b6f6cc7c0b6a4865fedbeeb874d399e18b77531d2698a6b637f
-  data.tar.gz: 984e51434aff689569fc61dd2b1a64135c95215313d5955637a848b8f4c58a452ee061860056b5f52182ddc67faddf3d1f7e821d393d615fede7b11d358f23af
+  metadata.gz: 2e287c543f3dea2c784b0df34ce79d7c50f2a84c387c1c8eb4ef46eedfd43ee9fe8a63a1dc6eae8a6351cbb951902578c53d048986bfe679b34d02bd48f409f7
+  data.tar.gz: 7d9de92299c327c44172abd06a73c331d5e0c2317a929d217af9aed9c1777c504b9e8174975d77e08c382efb6536f368b985dbab888895934e08ac1d8ab76021

data/app/controllers/ish_manager/application_controller.rb

@@ -63,7 +63,7 @@ module IshManager
       end
       # redirect_to resource_path( @resource )
     end
-    
+
     def resource_path resource
       case resource.class.name
       when 'City'

data/app/controllers/ish_manager/galleries_controller.rb

@@ -61,7 +61,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
     old_shared_profile_ids = @gallery.shared_profiles.map(&:id)
     authorize! :update, @gallery
 
-    params[:gallery][:tag_ids].delete('')
+    params[:gallery][:tag_ids].delete('') if params[:gallery][:tag_ids]
 
     params[:gallery][:shared_profiles].delete('')
     params[:gallery][:shared_profile_ids] = params[:gallery][:shared_profiles]

data/app/controllers/ish_manager/sites_controller.rb

@@ -1,5 +1,11 @@
+
 class IshManager::SitesController < IshManager::ApplicationController
-  
+
+  ## params:
+  ## :domain, :lang, :title, :subhead, :description, :homepage_layout, :layout,
+  ##   :n_features, :n_newsitems, :newsitems_per_page, :is_trash, :is_ads_enabled,
+  ##   :is_private, :play_videos_in_preview, :private_user_emails,
+
   def index
     authorize! :sites_index, ::Manager
     @site_groups = Site.where( :is_trash => false ).order_by( :lang => :desc ).group_by {|s|s.domain}
@@ -26,14 +32,15 @@ class IshManager::SitesController < IshManager::ApplicationController
     @site = Site.unscoped.find params[:id]
     authorize! :update, @site
   end
-  
+
   def new
-    authorize! :new, Site.new
     @site = Site.new
+    authorize! :new, @site
   end
 
   def create
     authorize! :create, Site.new
+    params[:site][:private_user_emails] = params[:site][:private_user_emails].gsub(/\s+/m, ' ').strip.split(" ") if params[:site][:private_user_emails]
     @site = Site.new params[:site].permit!
     if @site.save
       flash[:notice] = 'Success'
@@ -46,7 +53,7 @@ class IshManager::SitesController < IshManager::ApplicationController
   def update
     @site = Site.unscoped.find params[:id]
     authorize! :update, @site
-    
+
     params[:site][:private_user_emails] = params[:site][:private_user_emails].gsub(/\s+/m, ' ').strip.split(" ")
 
     if @site.update_attributes params[:site].permit!
@@ -57,9 +64,9 @@ class IshManager::SitesController < IshManager::ApplicationController
     redirect_to sites_path
   end
 
-  def newsitem_delete    
+  def newsitem_delete
     @site = Site.find params[:site_id]
-    authorize! :update, @site  
+    authorize! :update, @site
     n = @site.newsitems.find( params[:newsitem_id] )
     n.delete
     @site.touch

data/app/models/ish_manager/ability.rb

@@ -8,7 +8,7 @@ class IshManager::Ability
     # signed in user
     #
     unless user.blank?
-      
+
       #
       # only sudoer... total power
       #
@@ -17,7 +17,7 @@ class IshManager::Ability
       end
 
       can [ :home ], ::IshManager::Ability
-      
+
       #
       # role admin
       #
@@ -34,7 +34,7 @@ class IshManager::Ability
         can [ :edit, :update ], ::Gallery do |g|
           !g.is_trash && ( g.is_public || g.user_profile == user.profile )
         end
-        
+
         can [ :cities_index, :home, :sites_index ], ::Manager
 
         can [ :new ], Newsitem
@@ -44,7 +44,7 @@ class IshManager::Ability
           !g.is_trash && ( g.is_public || g.user_profile == user.profile )
         end
 
-        can [ :show, :edit, :update, :create_newsitem, :new_feature, :create_feature, :newsitems_index ], ::Site do |site|
+        can [ :new, :show, :edit, :update, :create_newsitem, :new_feature, :create_feature, :newsitems_index ], ::Site do |site|
           !site.is_private && !site.is_trash
         end
         can [ :manage ], Ish::StockWatch
@@ -85,15 +85,16 @@ class IshManager::Ability
         # can [ :index ], ::Report
 
         # can [ :index ], ::Video
-        
+
       end
 
     end
+
     #
     # anonymous user
     #
     user ||= ::User.new
-    
+
     can [ :show ], ::Gallery do |gallery|
       gallery.is_public
     end
@@ -101,6 +102,6 @@ class IshManager::Ability
     can [ :show ], ::Report do |report|
       report.is_public
     end
-    
+
   end
 end

data/app/views/ish_manager/videos/_embed_mini.erb

@@ -0,0 +1,4 @@
+
+<div class="video-embed-half">
+  <iframe width="200" height="150" src="//www.youtube.com/embed/<%= video.youtube_id %>" frameborder="0" allowfullscreen></iframe>
+</div>

data/app/views/ish_manager/videos/_index.haml

@@ -15,7 +15,12 @@
           .row
             .col-sm-6
               .float-left
-                .thumb= image_tag video.thumb.url(:thumb)
+                - if video.youtube_id.present?
+                  -## doesn't work with private videos, which are most
+                  -# .thumb-youtube= image_tag "https://img.youtube.com/vi/#{video.youtube_id}/1.jpg"
+                  = render 'embed_mini', video: video
+                - else
+                  .thumb= image_tag video.thumb.url(:thumb)
               .a
                 = link_to video.name, video_path( video )
                 .inline= button_to '[x]', video_path( video ), :method => :delete, :data => { :confirm => 'Are you sure?' }

data/app/views/ish_manager/videos/index.haml

@@ -1,6 +1,7 @@
 
-= render 'ish_manager/sites/header', :site => @site if @site
+.videos-index
+  = render 'ish_manager/sites/header', :site => @site if @site
 
-= render 'search', path: videos_path
+  = render 'search', path: videos_path
 
-= render 'index', :videos => @videos
+  = render 'index', :videos => @videos

data/app/views/ish_manager/videos/show.haml

@@ -16,5 +16,5 @@
     = link_to @video.video.url, @video.video.url
 
     %p <b>User Profile:</b> #{@video.user_profile.name}
-
-= @video.inspect
+    %p= image_tag @video.thumb.url(:thumb)
+    %p <b>Video:</b> #{@video.inspect}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.228
+  version: 0.1.8.233
 platform: ruby
 authors:
 - piousbox
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-26 00:00:00.000000000 Z
+date: 2021-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -354,6 +354,7 @@ files:
 - app/views/ish_manager/venues/show.haml
 - app/views/ish_manager/videos/_embed.erb
 - app/views/ish_manager/videos/_embed_half.erb
+- app/views/ish_manager/videos/_embed_mini.erb
 - app/views/ish_manager/videos/_form.haml
 - app/views/ish_manager/videos/_index.haml
 - app/views/ish_manager/videos/_index_title.haml