ish_manager 0.1.8.78 → 0.1.8.79
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/app/controllers/ish_manager/application_controller.rb +7 -0
- data/app/views/ish_manager/application/{_main_header.haml → _main_header_admin.haml} +0 -0
- data/app/views/ish_manager/application/_main_header_guy.haml +31 -0
- data/app/views/layouts/ish_manager/application.haml +2 -1
- metadata +3 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 8b7323d467dbb8abc968dd0fd97e3eea648c2c7d
|
|
4
|
+
data.tar.gz: b0506e9f069b96e5153e51354cbfde3c0bd18f99
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 8696ff2900e3f5e78d670cb7754ca0060394d7020456333be444789aa648588cbea245e89a3e5aad40f864fdeb767a2bb1c730215ba0de898098fa3ceca8e7fe
|
|
7
|
+
data.tar.gz: f734e888895b4529cf42e18c6c1412907a1b75360d48ac445d56ebe61cd7576a725889cfd9c32f7b20a47a17e9a45f0acc585efaf0ab7affa402308f6294fe37
|
|
@@ -26,8 +26,15 @@ module IshManager
|
|
|
26
26
|
@tags_list = Tag.list
|
|
27
27
|
end
|
|
28
28
|
|
|
29
|
+
rescue_from ::CanCan::AccessDenied, :with => :access_denied
|
|
30
|
+
|
|
29
31
|
private
|
|
30
32
|
|
|
33
|
+
def access_denied exception
|
|
34
|
+
store_location_for :user, request.path
|
|
35
|
+
redirect_to user_signed_in? ? root_path : Rails.application.routes.url_helpers.new_user_session_path, :alert => exception.message
|
|
36
|
+
end
|
|
37
|
+
|
|
31
38
|
def pp_errors err
|
|
32
39
|
err
|
|
33
40
|
end
|
|
File without changes
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
|
|
2
|
+
.manager--main-header
|
|
3
|
+
.container
|
|
4
|
+
.row
|
|
5
|
+
.col-sm-12
|
|
6
|
+
%i.fa.fa-compress.collapse-expand#collapseHeader
|
|
7
|
+
.content
|
|
8
|
+
%ul.nav.nav-pills
|
|
9
|
+
%li{ :class => params[:controller] == 'ish_manager/cities' ? 'active' : '' }= link_to 'Cities', cities_path
|
|
10
|
+
%li{ :class => params[:controller] == 'ish_manager/events' ? 'active' : '' }= link_to 'Events', events_path
|
|
11
|
+
%li{ :class => params[:controller] == 'ish_manager/venues' ? 'active' : '' }= link_to 'Venues', venues_path
|
|
12
|
+
%li{ :class => params[:controller] == 'ish_manager/user_profiles' ? 'active' : '' }= link_to 'Profiles', user_profiles_path
|
|
13
|
+
%li{ :class => params[:controller] == 'ish_manager/friends ' ? 'active' : '' }= link_to 'Friends', friends_path
|
|
14
|
+
%ul.nav.nav-pills
|
|
15
|
+
%li{ :class => params[:controller] == 'ish_manager/sites' ? 'active' : '' }= link_to 'Sites', sites_path
|
|
16
|
+
%li{ :class => params[:controller] == 'ish_manager/galleries' ? 'active' : '' }= link_to 'Galleries', galleries_path
|
|
17
|
+
%li{ :class => params[:controller] == 'ish_manager/reports' ? 'active' : '' }= link_to 'Reports', reports_path
|
|
18
|
+
%li{ :class => params[:controller] == 'ish_manager/videos' ? 'active' : '' }= link_to 'Videos', videos_path
|
|
19
|
+
%li{ :class => params[:controller] == 'ish_manager/tags' ? 'active' : '' }= link_to 'Tags', tags_path
|
|
20
|
+
%ul.nav.nav-pills
|
|
21
|
+
-# %li{ :class => params[:controller] == 'ish_manager/ally' ? 'active' : '' }= link_to 'Ally', ally_root_path
|
|
22
|
+
%li{ :class => params[:controller] == 'ish_manager/stock_actions' ? 'active' : '' }= link_to 'Stock Actions', stock_actions_path
|
|
23
|
+
%li{ :class => params[:controller] == 'ish_manager/stock_options' ? 'active' : '' }= link_to 'Stock Options', stock_options_path
|
|
24
|
+
%li{ :class => params[:controller] == 'ish_manager/stock_watches' ? 'active' : '' }= link_to 'Stock Watches', stock_watches_path
|
|
25
|
+
%ul.nav.nav-pills
|
|
26
|
+
%li{ :class => params[:controller] == 'ish_manager/invoices' ? 'active' : '' }= link_to 'Invoices', invoices_path
|
|
27
|
+
%li{ :class => params[:controller] == 'ish_manager/payments' ? 'active' : '' }= link_to 'Payments', payments_path
|
|
28
|
+
%ul.nav.nav-pills
|
|
29
|
+
%li{ :class => params[:controller] == 'ish_manager/leads' ? 'active' : '' }= link_to 'Leads', leads_path
|
|
30
|
+
%hr
|
|
31
|
+
|
|
@@ -18,7 +18,8 @@
|
|
|
18
18
|
= csrf_meta_tags
|
|
19
19
|
%body
|
|
20
20
|
.bg-white
|
|
21
|
-
=
|
|
21
|
+
- role = current_user ? current_user.profile.role_name : ''
|
|
22
|
+
= render :partial => "ish_manager/application/main_header_#{role}"
|
|
22
23
|
.container
|
|
23
24
|
.row
|
|
24
25
|
.col-sm-12
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ish_manager
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.8.
|
|
4
|
+
version: 0.1.8.79
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- piousbox
|
|
@@ -186,8 +186,9 @@ files:
|
|
|
186
186
|
- app/views/ish_manager/application/_analytics.html
|
|
187
187
|
- app/views/ish_manager/application/_form_errors.haml
|
|
188
188
|
- app/views/ish_manager/application/_main_footer.haml
|
|
189
|
-
- app/views/ish_manager/application/_main_header.haml
|
|
190
189
|
- app/views/ish_manager/application/_main_header.haml~
|
|
190
|
+
- app/views/ish_manager/application/_main_header_admin.haml
|
|
191
|
+
- app/views/ish_manager/application/_main_header_guy.haml
|
|
191
192
|
- app/views/ish_manager/application/_meta.haml
|
|
192
193
|
- app/views/ish_manager/application/_meta.haml~
|
|
193
194
|
- app/views/ish_manager/application/home.haml
|