ish_manager 0.1.8.305 → 0.1.8.308

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 215e65b2404d79cbe56fe9fbfb1b3bdb1946e7dad2ca093098b7b59c6a58543f
4
- data.tar.gz: 25e0eaef6fc00b26a822fbe337c702213a8d9baaf8d4512b094cb4f20f841f05
3
+ metadata.gz: 44982924fd5f24cf15bb1a43d2bef3b7e7d2f290de71f73e337d65908e153149
4
+ data.tar.gz: 884447b604588012c63f2a042df38fdc61f9c3404ea0c08470d9f551d0aaf6ac
5
5
  SHA512:
6
- metadata.gz: e26833ee104f2c35815d5ced45f2e07f9fce439185c1da030ff4e22b5c769999a7b26a14b8be9883bad8912bdbc9d9f808cb3a7657ed15b0f29a65535067c28e
7
- data.tar.gz: 6db88c7b55eaf76ae275b5ad7f9961b02491d2804736e7c702df4e0ca010d52fffe1b7852275bd67b7a6b040643aaaecfbd61b3a3e698c51d90055db48ba45a8
6
+ metadata.gz: d443fd90b32a58fbf9870bb4efa2afc6e7c67099bef416b8492c55cc3e7d21855d17a82710e34ea50e1ae922ca0e34d9d6c253685c873baf6b5c0674751f630e
7
+ data.tar.gz: d87775b6a899a2b2ef429f8dd6313c819de1358b7d5605de49344608e524b631fd2a79bae1289dbf6c161e4de06f43aeb1c0aedda1e6d8b4ca3d1854b61d1ab4
@@ -3,10 +3,12 @@ class IshManager::UsersController < IshManager::ApplicationController
3
3
 
4
4
  def index
5
5
  @users = User.all
6
+ authorize! :index, User
6
7
  end
7
8
 
8
9
  def show
9
10
  @user = User.find params[:id]
11
+ authorize! :show, @user
10
12
  end
11
13
 
12
14
  end
@@ -35,7 +35,8 @@
35
35
  %ul
36
36
  %li{ class: params[:controller] == 'ish_manager/newsitems' ? 'active' : '' }= link_to '+Newsitem', new_newsitem_path
37
37
  -# %li{ :class => params[:controller] == 'ish_manager/stock_watches' ? 'active' : '' }= link_to 'Stock Watches (old m3)', stock_watches_path
38
- %li= link_to 'Stock Watches', '/iron_warbler/stock_watches'
38
+ -# %li= link_to 'Stock Watches', '/iron_warbler/stock_watches'
39
+ %li{ :class => params[:controller] == 'ish_manager/users' ? 'active' : '' }= link_to 'Users', users_path
39
40
  %li{ :class => params[:controller] == 'ish_manager/user_profiles' ? 'active' : '' }= link_to 'Ish::UserProfiles', user_profiles_path
40
41
  %li
41
42
  = link_to "Ish::ImageAsset's", image_assets_path
@@ -1,5 +1,9 @@
1
1
  .manager-users--index
2
2
  %h2
3
- People
4
- (#{@city.current_users.length})
3
+ Users (#{users.count})
4
+
5
+ %ul.browser-default
6
+ - users.map do |user|
7
+ %li= user.email
8
+
5
9
  %hr
@@ -0,0 +1,2 @@
1
+
2
+ = render 'index', users: @users
data/config/routes.rb CHANGED
@@ -5,26 +5,19 @@ IshManager::Engine.routes.draw do
5
5
 
6
6
  root :to => 'application#home'
7
7
 
8
- resources :campaigns
9
-
8
+ ## @deprecated: use Locations
10
9
  resources :cities do
11
10
  resources :features
12
11
  resources :newsitems
13
12
  resources :reports
14
13
  resources :galleries
15
- resources :users
16
14
  resources :videos
17
15
  resources :events
18
16
  resources :venues
19
17
  resources :tags
20
18
  end
21
-
22
- resources :covered_calls
23
-
24
- resources :email_templates
25
19
  resources :events
26
20
 
27
- resources :features
28
21
  resources :friends
29
22
 
30
23
  get 'galleries', :to => 'galleries#index', :defaults => { :render_type => Gallery::RENDER_THUMBS }
@@ -39,14 +32,17 @@ IshManager::Engine.routes.draw do
39
32
 
40
33
  get 'image_assets', to: 'image_assets#index', as: :image_assets
41
34
 
42
- resources :invoices do
43
- # resources :payments
44
- end
45
- resources :iron_condors
35
+ # resources :invoices do
36
+ # resources :payments
37
+ # end
38
+ # resources :orders
46
39
 
47
- get 'leads', :to => 'leads#index', :defaults => { :is_done => false }
48
- get 'leads/done', :to => 'leads#index', :defaults => { :is_done => true }, :as => :done_leads
49
- resources :leads
40
+ # namespace :iron_warbler do
41
+ # resources :iron_condors
42
+ # resources :stock_watches
43
+ # resources :option_watches
44
+ # resources :covered_calls
45
+ # end
50
46
 
51
47
  scope 'gameui' do
52
48
  get 'maps/:id/map-editor', to: 'maps#map_editor', as: :location_map_editor
@@ -61,21 +57,25 @@ IshManager::Engine.routes.draw do
61
57
  resources 'markers'
62
58
  end
63
59
 
60
+ ## @TODO: move into a namespace, eg :office_suite
61
+ get 'leads', :to => 'leads#index', :defaults => { :is_done => false }
62
+ get 'leads/done', :to => 'leads#index', :defaults => { :is_done => true }, :as => :done_leads
63
+ resources :leads
64
64
  resources :meetings
65
+ namespace :office_suite do
66
+ resources :campaigns
67
+ resources :email_templates
68
+ resources :unsubscribes
69
+ end
65
70
 
66
71
  resources :newsitems
67
72
 
68
- resources :orders
69
- get 'co_tailors', :to => 'co_tailors#home'
70
- post 'co_tailors/products', :to => 'co_tailors#create_product'
71
- patch 'co_tailors/products/:id', :to => 'co_tailors#update_product', :as => :co_tailors_product
72
-
73
73
  resources :photos
74
74
  resources :payments
75
- ## profiles, see user_profiles
76
75
 
77
76
  resources :reports
78
77
 
78
+ ## @deprecated: use Locations
79
79
  resources :sites do
80
80
  resources :features
81
81
  resources :newsitems
@@ -90,10 +90,6 @@ IshManager::Engine.routes.draw do
90
90
  resources :tags
91
91
  end
92
92
 
93
- ## @TODO: move these to iron warbler
94
- resources :stock_watches
95
- resources :option_watches
96
-
97
93
  resources :tags do
98
94
  resources :features
99
95
  resources :newsitems
@@ -103,14 +99,16 @@ IshManager::Engine.routes.draw do
103
99
  resources :videos
104
100
  end
105
101
 
106
- resources :unsubscribes
102
+ resources :users
107
103
  resources :user_profiles do
108
104
  resources :newsitems
109
105
  end
110
106
  resources :user_profiles, :as => :profiles do
111
- resources :newsitems
107
+ # resources :newsitems
112
108
  end
113
109
 
110
+ ## @TODO: venues can only be in cities, right?
111
+ ## @deprecated: use Locations
114
112
  resources :venues
115
113
  resources :videos
116
114
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ish_manager
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.8.305
4
+ version: 0.1.8.308
5
5
  platform: ruby
6
6
  authors:
7
7
  - piousbox
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-08-31 00:00:00.000000000 Z
11
+ date: 2022-09-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: aws-sdk
@@ -428,6 +428,7 @@ files:
428
428
  - app/views/ish_manager/user_profiles/new.haml
429
429
  - app/views/ish_manager/user_profiles/show.haml
430
430
  - app/views/ish_manager/users/_index.haml
431
+ - app/views/ish_manager/users/index.haml
431
432
  - app/views/ish_manager/venues/_form.haml
432
433
  - app/views/ish_manager/venues/_index.haml
433
434
  - app/views/ish_manager/venues/_search.haml