ish_manager 0.1.8.224 → 0.1.8.229

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17ef25f7e30757abd440718a014ccc6c01e6358bc225ab7a43235dc64cefd15b
-  data.tar.gz: aeed4163d947a42ebc86b63a732899c9b0f2ea95fd21ab42662d3a5cac4e3765
+  metadata.gz: 9be117fe6d2f6a0cd5133bd15e0e1fef949bae677cd964f43a3321d1f7d729f2
+  data.tar.gz: 3b66ca0da2b1c935204eed4376e986959c259cbf786fb5318942c56efd09d480
 SHA512:
-  metadata.gz: a6b1a8b719762cc760d79025901245a30e6ef1e67e3d5be093c2fab960596e3f79692459d69a50f6253e933fd892ced4d6c0c49d00f7243652f378b5109e3914
-  data.tar.gz: 9b52b74a65ab93bc63fbbf22b79185440a69c6aaad01fe90d6500a0e4ac23045c1191be9dbb71dff6cbaaa11f62a25621a555bd2fe4acfb1b7b8bf50ecb57b3c
+  metadata.gz: df98c52939e5d91092bad302958365da1dc137cf191bbd75b1dec8aaa13474372f3967e749b99eade069cbddac35303dc6c36f867b2a4999bde18ea083f436a6
+  data.tar.gz: b93bd28f89c76950137c0710f58a60123a1f8177cb390039c430c35a72ae6d292747a33343b86c1747d295a7cc68133943ade3c7b5d757aa3a63f68737772a67

data/app/assets/stylesheets/ish_manager/galleries.css

@@ -15,8 +15,10 @@
   height: 100%;
   background-repeat: no-repeat;
   background-position: center center;
+  background-size: contain;
 }
 
 .large-photos .item .wrapper img {
   max-height: 100%;
+  max-width: 100%;
 }

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

@@ -41,7 +41,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
     if @gallery.save
       ::IshManager::ApplicationMailer.shared_galleries( params[:gallery][:shared_profiles], @gallery ).deliver
       flash[:notice] = 'Success'
-      redirect_to galleries_path
+      redirect_to edit_gallery_path(@gallery)
     else
       puts! @gallery.errors.messages
       flash[:alert] = 'No Luck. ' + @gallery.errors.inspect
@@ -61,18 +61,18 @@ class IshManager::GalleriesController < IshManager::ApplicationController
     old_shared_profile_ids = @gallery.shared_profiles.map(&:id)
     authorize! :update, @gallery
 
+    params[:gallery][:tag_ids].delete('')
+
     params[:gallery][:shared_profiles].delete('')
-    # params[:gallery][:shared_profiles] = IshModels::UserProfile.find( params[:gallery][:shared_profiles] ).to_a
     params[:gallery][:shared_profile_ids] = params[:gallery][:shared_profiles]
     params[:gallery].delete :shared_profiles
 
-    # puts! params[:gallery][:shared_profiles], 'shared profiles'
     if @gallery.update_attributes( params[:gallery].permit! )
       new_shared_profiles = IshModels::UserProfile.find( params[:gallery][:shared_profile_ids]
         ).select { |p| !old_shared_profile_ids.include?( p.id ) }
       ::IshManager::ApplicationMailer.shared_galleries( new_shared_profiles, @gallery ).deliver
       flash[:notice] = 'Success.'
-      redirect_to galleries_path
+      redirect_to gallery_path(@gallery)
     else
       puts! @gallery.errors.messages, 'cannot save gallery'
       flash[:alert] = 'No Luck. ' + @gallery.errors.messages.to_s

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/controllers/ish_manager/videos_controller.rb

@@ -87,6 +87,7 @@ class IshManager::VideosController < IshManager::ApplicationController
 
   def edit
     @video = Video.unscoped.find params[:id]
+    @user_profiles_list = IshModels::UserProfile.list
     authorize! :edit, @video
 
     @tags_list = Tag.unscoped.or( { :is_public => true }, { :user_id => current_user.id } ).list

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/galleries/show.haml

@@ -24,7 +24,8 @@
     - @photos.each do |photo|
       .col-xs-4
         .item{ :style => "border: 1px solid red;" }
-          = button_to '[x]', photo_path( :id => photo.id ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+          .float-left= button_to '[x]', photo_path( :id => photo.id ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+          = link_to "go to", "#large_#{photo.id}"
           %br
           = image_tag photo.photo.url( :thumb ), :alt => ''
 .spacer{ :style => 'height: 100px' }
@@ -33,6 +34,7 @@
 .center.large-photos
   - @photos.each do |photo|
     .item
-      .wrapper{ style: "background-image: url('#{photo.photo.url( :large )}')" }
-        = button_to '[x]', photo_path( :id => photo.id ), :method => :delete, :data => { :confirm => 'Are you sure?' }
-
+      %a{id: "large_#{photo.id}" }
+      .float-left= button_to '[x]', photo_path( :id => photo.id ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+      = link_to "large", photo.photo.url(:large)
+      .wrapper{ style: "background-image: url('#{photo.photo.url( :large )}')" }

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

@@ -24,10 +24,10 @@
           .panel-body
             %ul
               %li
-                = link_to '[~]', edit_url.call( n )
-                = button_to '[x]', delete_url.call( n ), :method => :delete, :data => { :confirm => 'Are you sure?' }
+                .float-left= link_to '[~]', edit_url.call( n )
+                .float-left= button_to '[x]', delete_url.call( n ), :method => :delete, :data => { :confirm => 'Are you sure?' }
                 Name: #{n.name}
-                Desc: #{n.descr}
+              %li Desc: #{n.descr}
               %li Report id: #{n.report_id}
               %li Gallery id: #{n.gallery_id}
               %li username: #{n.username}

data/app/views/ish_manager/newsitems/_item.haml

@@ -8,24 +8,29 @@
         - if n.photo.gallery.blank?
           = link_to image_tag( n.photo.photo.url(:small) ), n.photo.photo.url(:large), :rel => 'lightbox[newsitem]'
         - else
-          = link_to image_tag( n.photo.photo.url(:small) ), gallery_path( n.photo.gallery.galleryname, n.photo.gallery.photos.index(n.photo) ) 
+          = link_to image_tag( n.photo.photo.url(:small) ), gallery_path( n.photo.gallery.galleryname, n.photo.gallery.photos.index(n.photo) )
       .meta= render 'ish_manager/photos/meta', :photo => n.photo
-        
-  - if !n.report.blank?
-    .Nreport
-      %h3= link_to n.report.name, report_path(n.report.name_seo)
+
+  - if n.report
+    .Nreport.newsitem-report
+      %ul
+        %li <b>Report</b> #{n.report.id}
+        %li Premium Tier #{n.report.premium_tier}
+      %h5
+        = link_to n.report.name, report_path(n.report.name_seo)
+        = link_to "[~]", edit_report_path(n.report)
       .meta
-        New Report on #{pretty_date n.report.created_at} by #{n.report.username}
+        on #{pretty_date n.report.created_at} by #{n.report.username}
       - unless n.report.photo.blank?
         .thumb= link_to image_tag(n.report.photo.photo.url(:thumb), :alt => ''), report_path( n.report.name_seo )
       .subhead= n.report.subhead
       .c
-        
+
   - if !n.gallery.blank?
     .Ngallery
 
       %h3= link_to n.gallery.name, gallery_path(n.gallery.galleryname, 0)
-      .meta 
+      .meta
         #{t('newsitems.gallery', :username => n.gallery.username, :date => pretty_date(n.gallery.created_at))}
         - unless n.gallery.city.blank?
           = t('cities.in')
@@ -39,7 +44,7 @@
           = link_to image_tag( photo.photo.url(:thumb), :alt => photo.name ), photo.photo.url(:small), :rel => "lightbox[#{n.gallery.galleryname}]"
       -# .subhead= n.descr
       .c
-        
+
   - if n.video_id
     - video = Video.unscoped.find n.video_id
     .Nvideo
@@ -48,10 +53,10 @@
       = render 'ish_manager/application/meta', :item => video
       = render 'ish_manager/videos/embed_half', :video => video
       .c
-        
+
   - if !n.descr.blank? && n.gallery.blank? && n.report.blank?
     .Ndescr.panel
       .meta= pretty_date n.created_at
       .subhead= simple_format n.descr
       .c
-        
+

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

@@ -2,33 +2,31 @@
 -# ish_manager / tags / show
 
 - content_for :title do
-  Topic #{@tag.name}
-  
+  Tag #{@tag.name}
+
 .row
   .col-sm-12
     %h5.center
       Tag
       = @tag.name
       = link_to image_edit, edit_tag_path( @tag )
-      -# = link_to_delete( @tag )
-      .inline= button_to 'X', tag_path( @tag ), :method => :delete, :data => { :confirm => 'Are you sure?' } 
-    -# = render 'ads/leaderboard'
+      .inline= button_to 'X', tag_path( @tag ), :method => :delete, :data => { :confirm => 'Are you sure?' }
     -# .descr= @tag.descr # I don't wanna show this every time to everyone, they know what they are here for.
-    = render 'ish_manager/features/index', :features => @tag.features[0, Tag.n_features]
-    
+    -# = render 'ish_manager/features/index', :features => @tag.features[0, Tag.n_features]
+
+- proc do # nothing
+  .row
+    .col-sm-12
+      = render 'ish_manager/newsitems/index', :newsitems => @tag.newsitems, :resource => @tag, :tag => @tag
+
 .row
   .col-sm-12
-    = render 'ish_manager/newsitems/index', :newsitems => @tag.newsitems, :resource => @tag, :tag => @tag
-    
-.row
-  .col-sm-6
     = render 'ish_manager/reports/index', :reports => @tag.reports, :n_ads => 0
-    
-  .col-sm-6
+
+.row
+  .col-sm-12
     = render 'ish_manager/galleries/index_title', :galleries => @galleries, :n_thumbs => 4
-    
+
 .row
-  .col-sm-6
+  .col-sm-12
     = render 'ish_manager/videos/index_title', :videos => @videos
-  .col-sm-6
-    %h5 Here, nothing yet

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

@@ -1,7 +1,7 @@
 
 = form_for video do |f|
   = render 'form_errors', :item => @video
- 
+
   .row
     .col-md-6
       .field
@@ -32,7 +32,10 @@
       = f.number_field :premium_tier
     .col-sm-3
       = f.label :site
-      = select :gallery, :site_id, @sites_list
+      = f.select :site_id, @sites_list
+    .col-sm-3
+      = f.label :user_profile
+      = f.select :user_profile_id, @user_profiles_list
   .row
     .col-sm-4
       = f.check_box :is_public

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.224
+  version: 0.1.8.229
 platform: ruby
 authors:
 - piousbox
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-04 00:00:00.000000000 Z
+date: 2021-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -219,7 +219,6 @@ files:
 - app/mailers/ish_manager/application_mailer.rb
 - app/models/ish_manager/ability.rb
 - app/models/ish_manager/application_record.rb
-- app/views/ish_manager/ally/home.haml
 - app/views/ish_manager/application/_analytics.html
 - app/views/ish_manager/application/_form_errors.haml
 - app/views/ish_manager/application/_main_footer.haml
@@ -245,9 +244,6 @@ files:
 - app/views/ish_manager/cities/new_feature.haml
 - app/views/ish_manager/cities/new_newsitem.haml
 - app/views/ish_manager/cities/show.haml
-- app/views/ish_manager/co_tailors/_product_form.haml
-- app/views/ish_manager/co_tailors/home.haml
-- app/views/ish_manager/covered_calls/index.haml
 - app/views/ish_manager/events/_form.haml
 - app/views/ish_manager/events/_index.haml
 - app/views/ish_manager/events/edit.haml
@@ -260,7 +256,6 @@ files:
 - app/views/ish_manager/features/index.haml
 - app/views/ish_manager/features/new.haml
 - app/views/ish_manager/features/show.haml
-- app/views/ish_manager/friends/index.haml
 - app/views/ish_manager/galleries/_form.haml
 - app/views/ish_manager/galleries/_index.haml
 - app/views/ish_manager/galleries/_index_thumbs.haml
@@ -277,8 +272,6 @@ files:
 - app/views/ish_manager/invoices/_form.haml
 - app/views/ish_manager/invoices/index.haml
 - app/views/ish_manager/invoices/new.haml
-- app/views/ish_manager/iron_condors/_form.haml
-- app/views/ish_manager/iron_condors/index.haml
 - app/views/ish_manager/kaminari/_first_page.html.erb
 - app/views/ish_manager/kaminari/_gap.html.erb
 - app/views/ish_manager/kaminari/_last_page.html.erb
@@ -305,7 +298,6 @@ files:
 - app/views/ish_manager/newsitems/edit.haml
 - app/views/ish_manager/newsitems/index.haml
 - app/views/ish_manager/newsitems/new.haml
-- app/views/ish_manager/orders/index.haml
 - app/views/ish_manager/payments/index.haml
 - app/views/ish_manager/photos/_meta.haml
 - app/views/ish_manager/photos/_multinew.haml
@@ -340,6 +332,14 @@ files:
 - app/views/ish_manager/tags/index.haml
 - app/views/ish_manager/tags/new.haml
 - app/views/ish_manager/tags/show.haml
+- app/views/ish_manager/trash/ally/home.haml
+- app/views/ish_manager/trash/co_tailors/_product_form.haml
+- app/views/ish_manager/trash/co_tailors/home.haml
+- app/views/ish_manager/trash/covered_calls/index.haml
+- app/views/ish_manager/trash/friends/index.haml
+- app/views/ish_manager/trash/iron_condors/_form.haml
+- app/views/ish_manager/trash/iron_condors/index.haml
+- app/views/ish_manager/trash/orders/index.haml
 - app/views/ish_manager/user_profiles/_form.haml
 - app/views/ish_manager/user_profiles/edit.haml
 - app/views/ish_manager/user_profiles/index.haml
@@ -377,7 +377,7 @@ homepage: http://wasya.co
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -393,7 +393,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Summary of IshManager.
 test_files: []