ish_manager 0.1.8.79 → 0.1.8.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b7323d467dbb8abc968dd0fd97e3eea648c2c7d
-  data.tar.gz: b0506e9f069b96e5153e51354cbfde3c0bd18f99
+  metadata.gz: c496047d0ba8bc97bb079a3b8c1376acd3139ade
+  data.tar.gz: 59c10cd6e7f1f3a9650587f65d47a840e281c30f
 SHA512:
-  metadata.gz: 8696ff2900e3f5e78d670cb7754ca0060394d7020456333be444789aa648588cbea245e89a3e5aad40f864fdeb767a2bb1c730215ba0de898098fa3ceca8e7fe
-  data.tar.gz: f734e888895b4529cf42e18c6c1412907a1b75360d48ac445d56ebe61cd7576a725889cfd9c32f7b20a47a17e9a45f0acc585efaf0ab7affa402308f6294fe37
+  metadata.gz: 270b770ce3f3451a12721060b353d5bb56577fd775ba447adb04bf0673e3178a9b85bd2ad921012cb74d5e987c05391ccde5533861008ef51c3bd877be499dbd
+  data.tar.gz: f8dd14f212e5f2a4d4960e2c308c0ec5d4986ed165332886827e200e6befff8f0718ccafe1858936b59590941483a21fd53a37864514edee9d97a174a9c9fcd1

data/app/controllers/ish_manager/galleries_controller.rb

@@ -7,7 +7,7 @@ class IshManager::GalleriesController < IshManager::ApplicationController
     @galleries = Gallery.unscoped.where( :is_trash => false, :user_profile => current_user.profile
                                        ).order_by( :created_at => :desc 
                                                  ).page( params[:galleries_page] ).per( 10 )
-    @shared_galleries = current_user.profile.shared_galleries.page( params[:shared_galleries_page] ).per( 10 )
+    @shared_galleries = current_user.profile.shared_galleries.unscoped.where( :is_trash => false ).page( params[:shared_galleries_page] ).per( 10 )
   end
 
   def index_thumb

data/app/models/ish_manager/ability.rb

@@ -8,11 +8,6 @@ class IshManager::Ability
     # signed in user
     #
     unless user.blank?
-
-      can [ :index, :new, :create ], ::Gallery
-      can [ :show, :edit, :update, :create_photo ], ::Gallery do |gallery|
-        gallery.user_profile == user.profile
-      end
       
       can [ :home ], ::IshManager::Ability
       
@@ -21,7 +16,7 @@ class IshManager::Ability
       #
       # role manager
       #
-      if user.profile && [ :manager, :admin ].include?( user.profile.role_name )    
+      if user.profile && [ :admin, :manager ].include?( user.profile.role_name )    
 
         can [ :create_newsitem, :show, :new_feature, :create_feature ], ::City
 
@@ -42,15 +37,29 @@ class IshManager::Ability
 
       end
 
+      #
+      # only sudoer... total power
+      #
       if user.profile && user.profile.sudoer?
-        can :manage, :all # @TODO: this is important
-        can [ :manage ], ::Gallery
-        can [ :manage ], ::Gallery2
-        can [ :home ], ::Manager
-        can :destroy, ::Photo
+        can :manage, :all
+      end
+
+      #
+      # role guy (and manager)
+      #
+      if user.profile && [ :manager, :guy ].include?( user.profile.role_name )
+
+        can [ :index, :new, :create ], ::Gallery
+        can [ :show, :edit, :update, :create_photo ], ::Gallery do |gallery|
+          gallery.user_profile == user.profile
+        end
+
+        can [ :index ], ::Report
+
+        can [ :index ], ::Video
+        
       end
 
-      
     end
     #
     # anonymous user

data/app/views/ish_manager/application/_main_header_guy.haml

@@ -6,26 +6,10 @@
         %i.fa.fa-compress.collapse-expand#collapseHeader
         .content
           %ul.nav.nav-pills
-            %li{ :class => params[:controller] == 'ish_manager/cities'        ? 'active' : '' }= link_to 'Cities',    cities_path
-            %li{ :class => params[:controller] == 'ish_manager/events'        ? 'active' : '' }= link_to 'Events',    events_path
-            %li{ :class => params[:controller] == 'ish_manager/venues'        ? 'active' : '' }= link_to 'Venues',    venues_path
-            %li{ :class => params[:controller] == 'ish_manager/user_profiles' ? 'active' : '' }= link_to 'Profiles',  user_profiles_path
-            %li{ :class => params[:controller] == 'ish_manager/friends      ' ? 'active' : '' }= link_to 'Friends',   friends_path          
-          %ul.nav.nav-pills          
-            %li{ :class => params[:controller] == 'ish_manager/sites'         ? 'active' : '' }= link_to 'Sites',     sites_path
             %li{ :class => params[:controller] == 'ish_manager/galleries'     ? 'active' : '' }= link_to 'Galleries', galleries_path
             %li{ :class => params[:controller] == 'ish_manager/reports'       ? 'active' : '' }= link_to 'Reports',   reports_path
             %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
-          %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
-          %ul.nav.nav-pills
-            %li{ :class => params[:controller] == 'ish_manager/invoices'      ? 'active' : '' }= link_to 'Invoices', invoices_path
-            %li{ :class => params[:controller] == 'ish_manager/payments'      ? 'active' : '' }= link_to 'Payments', payments_path
+            %li{ :class => params[:controller] == 'ish_manager/friends      ' ? 'active' : '' }= link_to 'Friends',   friends_path          
           %ul.nav.nav-pills
-            %li{ :class => params[:controller] == 'ish_manager/leads'         ? 'active' : '' }= link_to 'Leads', leads_path
   %hr
 

data/app/views/ish_manager/application/_main_header_manager.html

@@ -0,0 +1,19 @@
+
+.manager--main-header
+  .container
+    .row
+      .col-sm-12
+        %i.fa.fa-compress.collapse-expand#collapseHeader
+        .content
+          %ul.nav.nav-pills
+            %li{ :class => params[:controller] == 'ish_manager/galleries'     ? 'active' : '' }= link_to 'Galleries', galleries_path
+            %li{ :class => params[:controller] == 'ish_manager/reports'       ? 'active' : '' }= link_to 'Reports',   reports_path
+            %li{ :class => params[:controller] == 'ish_manager/videos'        ? 'active' : '' }= link_to 'Videos',    videos_path
+            %li{ :class => params[:controller] == 'ish_manager/friends      ' ? 'active' : '' }= link_to 'Friends',   friends_path          
+          %ul.nav.nav-pills
+            %li{ :class => params[:controller] == 'ish_manager/cities'        ? 'active' : '' }= link_to 'Cities',    cities_path
+            %li{ :class => params[:controller] == 'ish_manager/events'        ? 'active' : '' }= link_to 'Events',    events_path
+            %li{ :class => params[:controller] == 'ish_manager/venues'        ? 'active' : '' }= link_to 'Venues',    venues_path
+            %li{ :class => params[:controller] == 'ish_manager/tags'          ? 'active' : '' }= link_to 'Tags',      tags_path
+  %hr
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.79
+  version: 0.1.8.80
 platform: ruby
 authors:
 - piousbox
@@ -189,6 +189,7 @@ files:
 - app/views/ish_manager/application/_main_header.haml~
 - app/views/ish_manager/application/_main_header_admin.haml
 - app/views/ish_manager/application/_main_header_guy.haml
+- app/views/ish_manager/application/_main_header_manager.html
 - app/views/ish_manager/application/_meta.haml
 - app/views/ish_manager/application/_meta.haml~
 - app/views/ish_manager/application/home.haml