From 0d5801528a97ce9ea0a119559581daeaa35f3d0f Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Sat, 30 Apr 2016 08:40:05 +0200 Subject: [PATCH] Do not show notify on feature enable/disable. Fixed not shown clue. --- .../app/controllers/_application_controller_generic.coffee | 2 ++ .../javascripts/app/controllers/_integration/_base.coffee | 2 +- .../app/controllers/_integration/clearbit.coffee | 2 +- .../app/controllers/_integration/sipgate_io.coffee | 2 +- app/assets/javascripts/app/controllers/dashboard.coffee | 2 +- app/assets/javascripts/app/models/setting.coffee | 6 ++++++ 6 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/app/controllers/_application_controller_generic.coffee b/app/assets/javascripts/app/controllers/_application_controller_generic.coffee index 5e4ace903..346405980 100644 --- a/app/assets/javascripts/app/controllers/_application_controller_generic.coffee +++ b/app/assets/javascripts/app/controllers/_application_controller_generic.coffee @@ -355,6 +355,8 @@ class App.ControllerNavSidbar extends App.ControllerContent constructor: (params) -> super + @navupdate '' + if @authenticateRequired return if !@authenticate() diff --git a/app/assets/javascripts/app/controllers/_integration/_base.coffee b/app/assets/javascripts/app/controllers/_integration/_base.coffee index fdc9befdc..929f27c5e 100644 --- a/app/assets/javascripts/app/controllers/_integration/_base.coffee +++ b/app/assets/javascripts/app/controllers/_integration/_base.coffee @@ -68,4 +68,4 @@ class App.ControllerIntegrationBase extends App.Controller value = items: [params] - App.Setting.set(@featureConfig, value) + App.Setting.set(@featureConfig, value, {notify: true}) diff --git a/app/assets/javascripts/app/controllers/_integration/clearbit.coffee b/app/assets/javascripts/app/controllers/_integration/clearbit.coffee index 54a9dc9b2..78fc6e1db 100644 --- a/app/assets/javascripts/app/controllers/_integration/clearbit.coffee +++ b/app/assets/javascripts/app/controllers/_integration/clearbit.coffee @@ -60,7 +60,7 @@ class Form extends App.Controller config setConfig: (value) -> - App.Setting.set('clearbit_config', value) + App.Setting.set('clearbit_config', value, {notify: true}) render: => @config = @currentConfig() diff --git a/app/assets/javascripts/app/controllers/_integration/sipgate_io.coffee b/app/assets/javascripts/app/controllers/_integration/sipgate_io.coffee index d7d0e6a1a..8998843bf 100644 --- a/app/assets/javascripts/app/controllers/_integration/sipgate_io.coffee +++ b/app/assets/javascripts/app/controllers/_integration/sipgate_io.coffee @@ -47,7 +47,7 @@ class Form extends App.Controller config setConfig: (value) -> - App.Setting.set('sipgate_config', value) + App.Setting.set('sipgate_config', value, {notify: true}) render: => @config = @currentConfig() diff --git a/app/assets/javascripts/app/controllers/dashboard.coffee b/app/assets/javascripts/app/controllers/dashboard.coffee index 8493c3585..66977ba5a 100644 --- a/app/assets/javascripts/app/controllers/dashboard.coffee +++ b/app/assets/javascripts/app/controllers/dashboard.coffee @@ -45,7 +45,7 @@ class App.Dashboard extends App.Controller mayBeClues: => return if !@clueAccess - return if !@activeState + return if !@shown return if @Config.get('switch_back_to_possible') preferences = @Session.get('preferences') @clueAccess = false diff --git a/app/assets/javascripts/app/models/setting.coffee b/app/assets/javascripts/app/models/setting.coffee index 57180b5e3..a1af9c003 100644 --- a/app/assets/javascripts/app/models/setting.coffee +++ b/app/assets/javascripts/app/models/setting.coffee @@ -12,6 +12,12 @@ class App.Setting extends App.Model setting.state_current.value = value if !options.done options.done = -> + if options.notify + App.Event.trigger 'notify', { + type: 'success' + msg: App.i18n.translateContent('Update successful!') + timeout: 2000 + } App.Setting.preferencesPost(@) if !options.fail