From 84ee6687af5de8fb920b2c78bb112b8214f2c652 Mon Sep 17 00:00:00 2001 From: Alex Giarrocco Date: Wed, 8 May 2019 17:48:56 -0400 Subject: [PATCH 1/4] Change route --- ckan/views/user.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ckan/views/user.py b/ckan/views/user.py index 70ff8acd667..8374d779f07 100644 --- a/ckan/views/user.py +++ b/ckan/views/user.py @@ -123,7 +123,7 @@ def index(): def me(): - route = u'dashboard.index' if g.user else u'user.login' + route = u'dataset' if g.user else u'user.login' return h.redirect_to(route) From 74a49ade2e45943633d14d184176d821df499c96 Mon Sep 17 00:00:00 2001 From: Alex Giarrocco Date: Thu, 9 May 2019 12:43:08 -0400 Subject: [PATCH 2/4] Optionally store route in config variable --- ckan/views/user.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ckan/views/user.py b/ckan/views/user.py index 8374d779f07..e18445b231f 100644 --- a/ckan/views/user.py +++ b/ckan/views/user.py @@ -123,7 +123,7 @@ def index(): def me(): - route = u'dataset' if g.user else u'user.login' + route = config.get(u'ckan.route_after_login', 'dashboard.index') if g.user else u'user.login' return h.redirect_to(route) From fe1b3f77e066db35d59f9a6844cc069900d6b312 Mon Sep 17 00:00:00 2001 From: Alex Giarrocco Date: Thu, 9 May 2019 13:00:27 -0400 Subject: [PATCH 3/4] Add prefix --- ckan/views/user.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ckan/views/user.py b/ckan/views/user.py index e18445b231f..95fcc5e5c4c 100644 --- a/ckan/views/user.py +++ b/ckan/views/user.py @@ -123,7 +123,7 @@ def index(): def me(): - route = config.get(u'ckan.route_after_login', 'dashboard.index') if g.user else u'user.login' + route = config.get(u'ckan.route_after_login', u'dashboard.index') if g.user else u'user.login' return h.redirect_to(route) From 6edfb7b900fe5aa5f80989492893ba5b3fd4a4dc Mon Sep 17 00:00:00 2001 From: Alex Giarrocco Date: Thu, 9 May 2019 13:12:22 -0400 Subject: [PATCH 4/4] Fix line length --- ckan/views/user.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ckan/views/user.py b/ckan/views/user.py index 95fcc5e5c4c..d8eef5f35c5 100644 --- a/ckan/views/user.py +++ b/ckan/views/user.py @@ -123,7 +123,10 @@ def index(): def me(): - route = config.get(u'ckan.route_after_login', u'dashboard.index') if g.user else u'user.login' + if g.user: + route = config.get(u'ckan.route_after_login', u'dashboard.index') + else: + route = u'user.login' return h.redirect_to(route)