thecore_ui_rails_admin 2.3.5 → 2.4.1

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: 6afdee67342dd81ce895511f249dcd7e00e5b25dff08304260ede1547ff7651e
4
- data.tar.gz: 7ee3dbf243ad43052672f0ac3d2ded93b3381343437099741e35202b095b230b
3
+ metadata.gz: 5f05a7912d450bd69a72d7f466be5af6da421fbedb33c5e77580689ef2a49793
4
+ data.tar.gz: 42a9db85419b19c0a2f2966235777a2e4a931fb1b2747a66c70731679239d6a0
5
5
  SHA512:
6
- metadata.gz: af2f3bfbece22b9da3eb7d36469b284aee31778c9e327251573ab0661039791873fe60c9565d0145899bd5cef9e2c12095a9d55eba8617592382d38ddb9f7d58
7
- data.tar.gz: 071b660f0bc6464690b7fdac0e46b808e002a55694dd164981407c5c01e0d3bf389df708be115656b7d27c354608bc431f3ae634dfba5a1cb0c02f12e4030b1c
6
+ metadata.gz: a574b1bf81b3a0f98f60d5a3ff7f6b23d009dbe9f6c40b36e1cbe0f974207cdb079ac8662055d54a1c19c906046ca0b3423a1b94350e86260ff4e82cef592a54
7
+ data.tar.gz: 7f1835a76ef33c5bf73d218311d78008715c8ca809a761a6f55f2faa059a77b80b9583ff8b556156281400188c238ea12de76302ac7b1a157c9d0584bf478948
@@ -138,9 +138,9 @@ body.rails_admin .nav.nav-tabs {
138
138
  .content {
139
139
  margin: 0px 0 15px 0;
140
140
  padding: 8px;
141
- background: $background;
141
+ background: transparent;
142
142
  &.dashboard {
143
- background: $background;
143
+ background: transparent;
144
144
  }
145
145
  .page-header {
146
146
  display: none;
@@ -9,7 +9,7 @@ module ThecoreConcern
9
9
  layout 'thecore'
10
10
  protect_from_forgery with: :exception, prepend: true
11
11
  rescue_from CanCan::AccessDenied do |exception|
12
- redirect_to main_app.root_url, :alert => exception.message
12
+ redirect_to main_app.root_url, alert: exception.message
13
13
  end
14
14
  include HttpAcceptLanguage::AutoLocale
15
15
  before_action :store_user_location!, if: :storable_location?
@@ -33,17 +33,22 @@ module ThecoreConcern
33
33
  action = root_actions.collect(&:action_name).first
34
34
  # REDIRECT TO THAT ACTION
35
35
 
36
- if stored_location_for(resource) && can?(resource, :all)
37
- stored_location_for(resource)
36
+ Rails.logger.info "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA: Checking redirect path"
37
+ stored_location = stored_location_for(resource)
38
+ if !stored_location.blank? && can?(resource, :all)
39
+ Rails.logger.info "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA: Checking redirect path: I'm in the IF stored_location_for(resource): #{stored_location}"
40
+ return stored_location
38
41
  elsif action
39
- rails_admin.send("#{action}_path").sub("#{ENV['RAILS_RELATIVE_URL_ROOT']}#{ENV['RAILS_RELATIVE_URL_ROOT']}", "#{ENV['RAILS_RELATIVE_URL_ROOT']}")
42
+ Rails.logger.info "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA: Checking redirect path: I'm in the ELSIF with action name: #{action}"
43
+ return rails_admin.send("#{action}_path").sub("#{ENV['RAILS_RELATIVE_URL_ROOT']}#{ENV['RAILS_RELATIVE_URL_ROOT']}", "#{ENV['RAILS_RELATIVE_URL_ROOT']}")
40
44
  else
45
+ Rails.logger.info "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA: Checking redirect path: I'm in the ELSE with root_path: #{root_path}"
41
46
  sign_out current_user
42
47
  user_session = nil
43
48
  current_user = nil
44
49
  flash[:alert] = "Your user is not authorized to access any page."
45
50
  flash[:notice] = nil
46
- root_url
51
+ return root_path
47
52
  end
48
53
  end
49
54
  end
@@ -100,7 +105,9 @@ module ThecoreConcern
100
105
 
101
106
  # Auto-sign out locked users
102
107
  def reject_locked!
103
- if current_user && current_user.locked?
108
+ Rails.logger.info "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB reject_locked"
109
+ if !current_user.blank? && current_user.locked?
110
+ Rails.logger.info "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB is locked"
104
111
  sign_out current_user
105
112
  user_session = nil
106
113
  current_user = nil
@@ -108,7 +115,9 @@ module ThecoreConcern
108
115
  flash[:notice] = nil
109
116
  redirect_to root_url
110
117
  end
118
+ Rails.logger.info "BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB is not locked = ok"
111
119
  end
120
+
112
121
 
113
122
  # Only permits admin users
114
123
  def require_admin!
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: thecore_ui_rails_admin
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.3.5
4
+ version: 2.4.1
5
5
  platform: ruby
6
6
  authors:
7
7
  - Gabriele Tassoni
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2021-07-01 00:00:00.000000000 Z
11
+ date: 2021-07-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thecore_ui_commons