ish_manager 0.1.8.306 → 0.1.8.307

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e03023907f1c1b21df0454db596bc2e146175b45351e294aa7a62e16838dcd4e
-  data.tar.gz: 6fdbb182e1e1b2288b3f95188f6b50d10e584bb7fca91e6a2328e7108610585d
+  metadata.gz: 3d5ed08f4fafe8db58090dbc0684eec85d393913a1530fbc755b2c3d41ae5770
+  data.tar.gz: 6f6e725887b2e96f27da8ced4b1107ae8e01a55daafe4592f2c097d6c2d7e589
 SHA512:
-  metadata.gz: 250f7d87fd7d8f57946ef662eef3017f630d7e462667ea466d1b6bbf924e67f5df18881a50685e7fbe0bb84504bce4ce85a79b57fd70e06bf8745cdfd869349d
-  data.tar.gz: 7149d068fcfd2a4c492d78456a4c5dd9a1b7bc931efbaf695d05c014c5cd503d117d4232809c302d85907d29233e2b58c72c463d70de1a662dbe70fc27c77424
+  metadata.gz: 68d779fe0e92d0b402969d25e8746518530e4440424c12738c291a91ede050c755ef0748a81dd5c45ef36d26068ce4c62c046aeae9de841509c6ea47c54660e8
+  data.tar.gz: bd0f7849717fcbf42926ec87db782bb2764dfba452f535135128a49e189640674db5fbdc2339e721fc32ce720eb5d5779ed585655cf90c282b59817d6ba3667e

data/app/controllers/ish_manager/users_controller.rb

@@ -3,10 +3,12 @@ class IshManager::UsersController < IshManager::ApplicationController
 
   def index
     @users = User.all
+    authorize! :index, User
   end
 
   def show
     @user = User.find params[:id]
+    authorize! :show, @user
   end
 
 end

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

@@ -35,7 +35,8 @@
       %ul
         %li{ class: params[:controller] == 'ish_manager/newsitems' ? 'active' : '' }= link_to '+Newsitem', new_newsitem_path
         -# %li{ :class => params[:controller] == 'ish_manager/stock_watches' ? 'active' : '' }= link_to 'Stock Watches (old m3)', stock_watches_path
-        %li= link_to 'Stock Watches', '/iron_warbler/stock_watches'
+        -# %li= link_to 'Stock Watches', '/iron_warbler/stock_watches'
+        %li{ :class => params[:controller] == 'ish_manager/users' ? 'active' : '' }= link_to 'Users',  users_path
         %li{ :class => params[:controller] == 'ish_manager/user_profiles' ? 'active' : '' }= link_to 'Ish::UserProfiles',  user_profiles_path
         %li
           = link_to "Ish::ImageAsset's", image_assets_path

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

@@ -1,5 +1,9 @@
 .manager-users--index
   %h2
-    People
-    (#{@city.current_users.length})
+    Users (#{users.count})
+
+  %ul.browser-default
+    - users.map do |user|
+      %li= user.email
+
   %hr

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

@@ -0,0 +1,2 @@
+
+= render 'index', users: @users

data/config/routes.rb

@@ -5,26 +5,19 @@ IshManager::Engine.routes.draw do
 
   root :to => 'application#home'
 
-  resources :campaigns
-
+  ## @deprecated: use Locations
   resources :cities do
     resources :features
     resources :newsitems
     resources :reports
     resources :galleries
-    resources :users
     resources :videos
     resources :events
     resources :venues
     resources :tags
   end
-
-  resources :covered_calls
-
-  resources :email_templates
   resources :events
 
-  resources :features
   resources :friends
 
   get 'galleries', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_THUMBS }
@@ -39,14 +32,17 @@ IshManager::Engine.routes.draw do
 
   get 'image_assets', to: 'image_assets#index', as: :image_assets
 
-  resources :invoices do
-    # resources :payments
-  end
-  resources :iron_condors
+  # resources :invoices do
+  #   resources :payments
+  # end
+  # resources :orders
 
-  get 'leads',      :to => 'leads#index', :defaults => { :is_done => false }
-  get 'leads/done', :to => 'leads#index', :defaults => { :is_done => true }, :as => :done_leads
-  resources :leads
+  # namespace :iron_warbler do
+  #   resources :iron_condors
+  #   resources :stock_watches
+  #   resources :option_watches
+  #   resources :covered_calls
+  # end
 
   scope 'gameui' do
     get 'maps/:id/map-editor', to: 'maps#map_editor', as: :location_map_editor
@@ -61,21 +57,25 @@ IshManager::Engine.routes.draw do
     resources 'markers'
   end
 
+  ## @TODO: move into a namespace, eg :office_suite
+  get 'leads',      :to => 'leads#index', :defaults => { :is_done => false }
+  get 'leads/done', :to => 'leads#index', :defaults => { :is_done => true }, :as => :done_leads
+  resources :leads
   resources :meetings
+  namespace :office_suite do
+    resources :campaigns
+    resources :email_templates
+    resources :unsubscribes
+  end
 
   resources :newsitems
 
-  resources :orders
-  get 'co_tailors',                :to => 'co_tailors#home'
-  post 'co_tailors/products',      :to => 'co_tailors#create_product'
-  patch 'co_tailors/products/:id', :to => 'co_tailors#update_product', :as => :co_tailors_product
-
   resources :photos
   resources :payments
-  ## profiles, see user_profiles
 
   resources :reports
 
+  ## @deprecated: use Locations
   resources :sites do
     resources :features
     resources :newsitems
@@ -90,10 +90,6 @@ IshManager::Engine.routes.draw do
     resources :tags
   end
 
-  ## @TODO: move these to iron warbler
-  resources :stock_watches
-  resources :option_watches
-
   resources :tags do
     resources :features
     resources :newsitems
@@ -103,14 +99,16 @@ IshManager::Engine.routes.draw do
     resources :videos
   end
 
-  resources :unsubscribes
+  resources :users
   resources :user_profiles do
     resources :newsitems
   end
   resources :user_profiles, :as => :profiles do
-    resources :newsitems
+    # resources :newsitems
   end
 
+  ## @TODO: venues can only be in cities, right?
+  ## @deprecated: use Locations
   resources :venues
   resources :videos
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ish_manager
 version: !ruby/object:Gem::Version
-  version: 0.1.8.306
+  version: 0.1.8.307
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-31 00:00:00.000000000 Z
+date: 2022-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -428,6 +428,7 @@ files:
 - app/views/ish_manager/user_profiles/new.haml
 - app/views/ish_manager/user_profiles/show.haml
 - app/views/ish_manager/users/_index.haml
+- app/views/ish_manager/users/index.haml
 - app/views/ish_manager/venues/_form.haml
 - app/views/ish_manager/venues/_index.haml
 - app/views/ish_manager/venues/_search.haml