ish_manager 0.1.8.182 → 0.1.8.188

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7990b7acd578db3780ac3aedfdc3761665f59f7c98dedeb72b599d3c677e7692
-  data.tar.gz: c7f1981376099323762b176a194ec3583f490d5d514abd83239be26b9a383b0a
+  metadata.gz: 8fa2cffe916b98958175ed5817ff65de2ec00988d9d1e1bdccdc8ebcdd21d42d
+  data.tar.gz: 2e68d9197188f09f3354d290adf83b76b2781a216f6b2a0271f35ec3a1e8152e
 SHA512:
-  metadata.gz: 1478fbf0b23665ceeac76d44c90df51b502346c3fb17859fc0f4366a7cb006dd20c911bde904c031ef79cfc3d2fefdacbe535cd7cc4988cbbb6a479e995375dd
-  data.tar.gz: 87cad18a4d0b0d8ffe0f4dc4645e7bfc867ffe58cd6ff070778c949cb30e664bc59dae474dc08c3db297d9345b8093d5e2c6f411952aa6ed489376d266735535
+  metadata.gz: 5bc562a2509aab8ae80c33692f52301a7abe447cd648f52980c87947287cb302920128793a3d98f6080b5c8bcfa34965a69aea052ff17e4cc74311ba531a761b
+  data.tar.gz: 843621098f8e633960aac56441c5080fdc75e3938d6e344bd83dc48336accb9e453262bc45a0ae9b0ca9256cf1c777ea4019e1d30def3cc95c1e62fbc5cc3366

data/app/controllers/ish_manager/cities_controller.rb

@@ -75,6 +75,15 @@ class IshManager::CitiesController < IshManager::ApplicationController
     redirect_to cities_path
   end
 
+  def delete
+    c = City.find params[:id]
+    if c.delete
+      render
+    else
+      flash[:error] = c.errors.messages
+    end
+  end
+
   private
 
   def sett_city

data/app/models/ish_manager/ability.rb

@@ -9,27 +9,36 @@ class IshManager::Ability
     #
     unless user.blank?
       
+      #
+      # only sudoer... total power
+      #
+      if user.profile && user.profile.sudoer?
+        can :manage, :all
+      end
+
       can [ :home ], ::IshManager::Ability
       
       can [ :friends_index, :friends_new ], ::IshModels::UserProfile
 
       #
-      # role manager
+      # role admin, manager
       #
       if user.profile && [ :admin, :manager ].include?( user.profile.role_name )    
 
         can [ :create_newsitem, :show, :new_feature, :create_feature ], ::City
+        can [ :manage ], ::CoTailors
 
         can [ :new ], ::Feature
 
-        can [ :manage ], ::CoTailors
+        can [ :index ], ::Gallery
+        
         can [ :cities_index, :home, :sites_index, :venues_index ], ::Manager
 
         can [ :new ], Newsitem
 
         can [ :new, :create ], Report
 
-        can [ :show, :edit, :update, :create_newsitem, :new_feature, :create_feature ], ::Site do |site|
+        can [ :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
@@ -38,13 +47,6 @@ class IshManager::Ability
 
       end
 
-      #
-      # only sudoer... total power
-      #
-      if user.profile && user.profile.sudoer?
-        can :manage, :all
-      end
-
       #
       # role guy (and manager)
       #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.182
+  version: 0.1.8.188
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-11 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -237,12 +237,6 @@ files:
 - app/views/ish_manager/galleries/index_titles.haml
 - app/views/ish_manager/galleries/new.haml
 - app/views/ish_manager/galleries/show.haml
-- app/views/ish_manager/galleries/trash/_index.haml
-- app/views/ish_manager/galleries/trash/_list_short.haml
-- app/views/ish_manager/galleries/trash/_menu_secondary.haml
-- app/views/ish_manager/galleries/trash/all_photos.haml
-- app/views/ish_manager/galleries/trash/index_short.haml
-- app/views/ish_manager/galleries/trash/index_thumb.haml
 - app/views/ish_manager/invoices/_form.haml
 - app/views/ish_manager/invoices/index.haml
 - app/views/ish_manager/invoices/new.haml

data/app/views/ish_manager/galleries/trash/_index.haml

@@ -1 +0,0 @@
-app/views/ish_manager/galleries/trash/_list.haml

data/app/views/ish_manager/galleries/trash/_list_short.haml

@@ -1,9 +0,0 @@
-
-%ul
-  - galleries.each do |gallery|
-    %li
-      = link_to '[~]', edit_gallery_path( gallery )
-      = link_to gallery.name, gallery_path( gallery )
-      %br
-      \      
-      N photos: #{gallery.photos.length}

data/app/views/ish_manager/galleries/trash/_menu_secondary.haml

@@ -1,13 +0,0 @@
-
-
-.row.menu-secondary
-  .large-12.columns.tags
-    Tags
-    %ul.inline-list
-      - @tags.each do |tag|
-        %li
-          = link_to tag.name, manager_tag_path(tag)
-          (#{tag.galleries.length})
-
-  .c
-      

data/app/views/ish_manager/galleries/trash/all_photos.haml

@@ -1,4 +0,0 @@
-
-
-- @photos.fresh.each do |ph|
-  = image_tag ph.photo.url(:mini)

data/app/views/ish_manager/galleries/trash/index_short.haml

@@ -1,19 +0,0 @@
-
-
-%h2
-  = link_to 'Galleries', manager_galleries_path
-  = link_to '[+]', new_manager_gallery_path
-
-.as
-  - @galleries.each do |g|
-    .clear
-    .a
-      = link_to '[~]', edit_manager_gallery_path(g)
-      = link_to g.name, manager_gallery_path(g.id)
-      = link_to '[+]', new_photo_path( :galleryname => g.galleryname )
-      = link_to '[++]', add_photos_path(g.id)
-      .float-right= button_to '[x]', manager_gallery_path(g), :method => :delete
-
-.clear
-= paginate @galleries, :param_name => :galleries_page
-

data/app/views/ish_manager/galleries/trash/index_thumb.haml

@@ -1,16 +0,0 @@
-
-.row
-  .large-12.columns
-    %h1 Manager Galleries List
-
-    = paginate @galleries, :param_name => :galleries_page
-    %ul
-      - @galleries.each do |gallery|
-        %li
-          = link_to '[~]', edit_manager_gallery_path( gallery )
-          = link_to gallery.name, manager_gallery_path( gallery )
-          %br
-          - gallery.photos.each_with_index do |photo, idx|
-            - if idx < 8
-              = image_tag photo.photo.url :thumb
-    = paginate @galleries, :param_name => :galleries_page