-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathexperiment_no_current_config
More file actions
48 lines (46 loc) · 1.9 KB
/
experiment_no_current_config
File metadata and controls
48 lines (46 loc) · 1.9 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
diff --git i/app/controllers/access_controller.rb w/app/controllers/access_controller.rb
index e87a5a..432124 100644
--- i/app/controllers/access_controller.rb
+++ w/app/controllers/access_controller.rb
@@ -22,15 +22,19 @@ class AccessController < ApplicationController
logger.debug "*** User (#{authorized_user.id}) #{authorized_user.nick} is logged! ***"
current_registry = Registry.find_by user_id: authorized_user.id, event_id: Event.current.id
- helpers.set_session_vars authorized_user.id, authorized_user.is_admin, current_registry.id
- # session[:user_id] = authorized_user.id
- # session[:is_admin] = authorized_user.is_admin
- # session[:reg_id] = current_registry.id
+ helpers.set_session_vars authorized_user.id, authorized_user.is_admin, current_registry&.id
if session[:return_to]
+ # Redirect to requested page
redirect_to session[:return_to]
session[:return_to] = nil
else
+ # User has no subscription active
+ unless session[:reg_id]
+ redirect_to controller: :users, action: :show, id: authorized_user.id
+ return
+ end
+
redirect_to controller: :registries, action: :show, id: session[:reg_id]
end
else
diff --git i/app/controllers/application_controller.rb w/app/controllers/application_controller.rb
index a43531..21f03a 100644
--- i/app/controllers/application_controller.rb
+++ w/app/controllers/application_controller.rb
@@ -25,7 +25,14 @@ class ApplicationController < ActionController::Base
def start_path
if helpers.session_active?
url_for session[:return_to] = nil
- url_for registry_path(session[:reg_id])
+
+ if session[:reg_id]
+ # Has current subscription
+ url_for registry_path(session[:reg_id])
+ else
+ # No subscription
+ url_for user_path(session[:user_id])
+ end
else
url_for root_url
end