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() 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'}) 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) )