ish_manager 0.1.8.221 → 0.1.8.226

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51f674f0353e8b9c333c9a984c39b0ffbc3a8add7548125a37b61a959d941bab
-  data.tar.gz: 4e00972b73af87a2adf88bd80465082952e34b42320336771ca8d5a2ad504dac
+  metadata.gz: 85b4cab8bd5d1cd3c1774dee82948ee0d59b3ef4d28d13acdab2e2208771b05a
+  data.tar.gz: 38fb5c28ff903e6fcca7201452c627565788a13615c6c28a709668d2015c7226
 SHA512:
-  metadata.gz: 39be779fd1aa26366ba966cef841b3d7bcc57096f6b885064322c2603a9f06c3b987577f6123936b788ff7a3a85f085d2fbe0a429ec5e8cda84a387c74778749
-  data.tar.gz: fe99f72254c7fd87f63768df7b825798b69c458828dbe26138b9942ae7461d9e2b63a50913d6e0801bf0da8ccd7f0e61b0602349479edb4f342c87208b3fd80b
+  metadata.gz: 29f1dddb16814fa2ac28444b494a284fca08a4acd80049d5d4187c47215a773d4fdfe0acc3500de83e66fe3c283946e73dc86833085c12caf0ffd795322905b7
+  data.tar.gz: 66c57c05133f55095b575aa5856f84bb839b14d4555955e7c55b4be141e756cbfb63b842f8cc3762a26085b31e9808da72668dbd3da9b2c5d3ca38130d58667f

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

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/views/ish_manager/application/_main_header_admin.haml

@@ -21,14 +21,13 @@
             %li{ :class => params[:controller] == 'ish_manager/videos'        ? 'active' : '' }= link_to 'Videos',    videos_path
             %li{ :class => params[:controller] == 'ish_manager/tags'          ? 'active' : '' }= link_to 'Tags',      tags_path
 
-        - proc do # nothing
           %ul.nav.nav-pills
             -# %li{ :class => params[:controller] == 'ish_manager/ally'          ? 'active' : '' }= link_to 'Ally',      ally_root_path
             -# %li{ :class => params[:controller] == 'ish_manager/stock_actions' ? 'active' : '' }= link_to 'Stock Actions', stock_actions_path
             -# %li{ :class => params[:controller] == 'ish_manager/stock_options' ? 'active' : '' }= link_to 'Stock Options', stock_options_path
             %li{ :class => params[:controller] == 'ish_manager/stock_watches' ? 'active' : '' }= link_to 'Stock Watches', stock_watches_path
-            %li{ :class => params[:controller] == 'ish_manager/iron_condors' ? 'active' : '' }= link_to 'Iron Condors', iron_condors_path
-            %li{ :class => params[:controller] == 'ish_manager/covered_calls' ? 'active' : '' }= link_to 'Covered Calls', covered_calls_path
+            -# %li{ :class => params[:controller] == 'ish_manager/iron_condors' ? 'active' : '' }= link_to 'Iron Condors', iron_condors_path
+            -# %li{ :class => params[:controller] == 'ish_manager/covered_calls' ? 'active' : '' }= link_to 'Covered Calls', covered_calls_path
 
         - proc do # nothing
           %ul.nav.nav-pills

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,9 @@
 .center.large-photos
   - @photos.each do |photo|
     .item
-      .wrapper{ style: "background-image: url('#{photo.photo.url( :large )}')" }
+      %a{id: "large_#{photo.id}" }
+      -# .wrapper{ style: "background-image: url('#{photo.photo.url( :large )}')" }
+      .wrapper
         = button_to '[x]', photo_path( :id => photo.id ), :method => :delete, :data => { :confirm => 'Are you sure?' }
-
+        = image_tag photo.photo.url(:large)
+        = link_to "large", 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/user_profiles/index.haml

@@ -2,7 +2,7 @@
 %h5
   User Profiles (#{@user_profiles.count})
   = link_to '[+]', new_user_profile_path
- 
+
 
 - @user_profiles.each do |profile|
   .panel
@@ -17,7 +17,6 @@
             %li <b>Role:</b> #{profile.role_name}
             %li <b>User.email:</b> #{profile.user ? profile.user.email : nil}
             %li <b>City:</b> #{profile.current_city ? profile.current_city.name : nil}
-            %li <b>About:</b> #{profile.about}
         .col-sm-8
           %h5 Shared galleries
           - profile.shared_galleries.unscoped.where( :is_trash => false ).each do |g|

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

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

@@ -15,4 +15,6 @@
     %hr
     = link_to @video.video.url, @video.video.url
 
-    -# = render 'disqus'
+    %p <b>User Profile:</b> #{@video.user_profile.name}
+
+= @video.inspect

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.221
+  version: 0.1.8.226
 platform: ruby
 authors:
 - piousbox
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-25 00:00:00.000000000 Z
+date: 2020-12-25 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: []