From 2072ac7c9bae2f5853d9dce02808a3d9e0e73da5 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Wed, 31 Aug 2016 13:46:56 +0200 Subject: [PATCH 1/7] Test 1. --- app/assets/javascripts/app/controllers/dashboard.coffee | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/controllers/dashboard.coffee b/app/assets/javascripts/app/controllers/dashboard.coffee index c87361840..9f39d9c02 100644 --- a/app/assets/javascripts/app/controllers/dashboard.coffee +++ b/app/assets/javascripts/app/controllers/dashboard.coffee @@ -93,13 +93,16 @@ class App.Dashboard extends App.Controller @$(".tab-content.#{target}").removeClass('hidden') class DashboardRouter extends App.ControllerPermanent - requiredPermission: ['*'] + #requiredPermission: ['*'] constructor: (params) -> super # check authentication - @authenticateCheckRedirect() + #@authenticateCheckRedirect() + if !@authenticateCheck() + @navigate '#login' + return App.TaskManager.execute( key: 'Dashboard' From 894f3c4dd183cbcdc43bcd8d32fe691dbbe1f221 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Wed, 31 Aug 2016 14:24:36 +0200 Subject: [PATCH 2/7] Test 2. --- .../javascripts/app/controllers/widget/maintenance.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/app/controllers/widget/maintenance.coffee b/app/assets/javascripts/app/controllers/widget/maintenance.coffee index 3f1ea0e46..004554342 100644 --- a/app/assets/javascripts/app/controllers/widget/maintenance.coffee +++ b/app/assets/javascripts/app/controllers/widget/maintenance.coffee @@ -41,7 +41,7 @@ class Widget extends App.Controller maintanaceMode: (data = {}) => return if data.on isnt true - @authenticateCheckRedirect() + return if !@authenticateCheck() @navigate '#logout' #App.Event.trigger('maintenance', {type:'restart_auto'}) From c1a46b863ca8d08bfca4d6dbd1a4430bb1ac0c0f Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Wed, 31 Aug 2016 16:39:56 +0200 Subject: [PATCH 3/7] Revert "Test 1." This reverts commit 2072ac7c9bae2f5853d9dce02808a3d9e0e73da5. --- app/assets/javascripts/app/controllers/dashboard.coffee | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/app/controllers/dashboard.coffee b/app/assets/javascripts/app/controllers/dashboard.coffee index 9f39d9c02..c87361840 100644 --- a/app/assets/javascripts/app/controllers/dashboard.coffee +++ b/app/assets/javascripts/app/controllers/dashboard.coffee @@ -93,16 +93,13 @@ class App.Dashboard extends App.Controller @$(".tab-content.#{target}").removeClass('hidden') class DashboardRouter extends App.ControllerPermanent - #requiredPermission: ['*'] + requiredPermission: ['*'] constructor: (params) -> super # check authentication - #@authenticateCheckRedirect() - if !@authenticateCheck() - @navigate '#login' - return + @authenticateCheckRedirect() App.TaskManager.execute( key: 'Dashboard' From 23f7fb2b1d0aeabb79ffead077a58f386c8afdfb Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Wed, 31 Aug 2016 19:06:32 +0200 Subject: [PATCH 4/7] Improved error handling (try/catch). --- .../app/lib/app_post/interface_handle.coffee | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/app/lib/app_post/interface_handle.coffee b/app/assets/javascripts/app/lib/app_post/interface_handle.coffee index 69c464792..00968ac55 100644 --- a/app/assets/javascripts/app/lib/app_post/interface_handle.coffee +++ b/app/assets/javascripts/app/lib/app_post/interface_handle.coffee @@ -75,12 +75,6 @@ class App.Content extends App.ControllerWidgetPermanent @el.unbind() @el.undelegate() - # send current controller - params_only = {} - for i of params - if typeof params[i] isnt 'object' - params_only[i] = params[i] - # remember history # needed to mute "redirect" url to support browser back history = App.Config.get('History') @@ -91,7 +85,10 @@ class App.Content extends App.ControllerWidgetPermanent # execute controller controller = (params) => params.el = @el - new callback(params) + try + new callback(params) + catch e + @log 'error', "route #{route}:", e controller(params) ) From ad19a2e5e5e8ef4cfd6d910a511757e9bc856010 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Wed, 31 Aug 2016 20:12:34 +0200 Subject: [PATCH 5/7] Test 3. --- app/assets/javascripts/app/controllers/dashboard.coffee | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/controllers/dashboard.coffee b/app/assets/javascripts/app/controllers/dashboard.coffee index c87361840..9f39d9c02 100644 --- a/app/assets/javascripts/app/controllers/dashboard.coffee +++ b/app/assets/javascripts/app/controllers/dashboard.coffee @@ -93,13 +93,16 @@ class App.Dashboard extends App.Controller @$(".tab-content.#{target}").removeClass('hidden') class DashboardRouter extends App.ControllerPermanent - requiredPermission: ['*'] + #requiredPermission: ['*'] constructor: (params) -> super # check authentication - @authenticateCheckRedirect() + #@authenticateCheckRedirect() + if !@authenticateCheck() + @navigate '#login' + return App.TaskManager.execute( key: 'Dashboard' From 63244c6c18f2c4b3d3aea8f671a4a4ffe2b63413 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Wed, 31 Aug 2016 20:44:51 +0200 Subject: [PATCH 6/7] Test 4. --- .../app/controllers/_application_controller.coffee | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_application_controller.coffee b/app/assets/javascripts/app/controllers/_application_controller.coffee index ba525ec34..5209d4d4f 100644 --- a/app/assets/javascripts/app/controllers/_application_controller.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller.coffee @@ -640,23 +640,21 @@ class App.Controller extends Spine.Controller class App.ControllerPermanent extends App.Controller constructor: -> - super - - # check authentication if @requiredPermission @permissionCheckRedirect(@requiredPermission, true) + super + $('.content').addClass('hide') @navShow() class App.ControllerContent extends App.Controller constructor: -> - super - - # check authentication if @requiredPermission @permissionCheckRedirect(@requiredPermission) + super + $('.content').addClass('hide') $('#content').removeClass('hide') @navShow() From ffac7a74893b6a48f2694868a0aa990b7ea99633 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Wed, 31 Aug 2016 22:34:48 +0200 Subject: [PATCH 7/7] Test 5. --- app/assets/javascripts/app/controllers/dashboard.coffee | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/app/controllers/dashboard.coffee b/app/assets/javascripts/app/controllers/dashboard.coffee index 9f39d9c02..c87361840 100644 --- a/app/assets/javascripts/app/controllers/dashboard.coffee +++ b/app/assets/javascripts/app/controllers/dashboard.coffee @@ -93,16 +93,13 @@ class App.Dashboard extends App.Controller @$(".tab-content.#{target}").removeClass('hidden') class DashboardRouter extends App.ControllerPermanent - #requiredPermission: ['*'] + requiredPermission: ['*'] constructor: (params) -> super # check authentication - #@authenticateCheckRedirect() - if !@authenticateCheck() - @navigate '#login' - return + @authenticateCheckRedirect() App.TaskManager.execute( key: 'Dashboard'