Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Do not show notify on feature enable/disable. Fixed not shown clue.

Browse source
This commit is contained in:
Martin Edenhofer 2016-04-30 08:40:05 +02:00
parent 81e27f8901
commit 0d5801528a
6 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/_application_controller_generic.coffee
View file

@ -355,6 +355,8 @@ class App.ControllerNavSidbar extends App.ControllerContent
constructor: (params) -> constructor: (params) ->
super super
@navupdate ''
if @authenticateRequired if @authenticateRequired
return if !@authenticate() return if !@authenticate()

2
app/assets/javascripts/app/controllers/_integration/_base.coffee
View file

@ -68,4 +68,4 @@ class App.ControllerIntegrationBase extends App.Controller
value = value =
items: [params] items: [params]
App.Setting.set(@featureConfig, value) App.Setting.set(@featureConfig, value, {notify: true})

2
app/assets/javascripts/app/controllers/_integration/clearbit.coffee
View file

@ -60,7 +60,7 @@ class Form extends App.Controller
config config
setConfig: (value) -> setConfig: (value) ->
App.Setting.set('clearbit_config', value) App.Setting.set('clearbit_config', value, {notify: true})
render: => render: =>
@config = @currentConfig() @config = @currentConfig()

2
app/assets/javascripts/app/controllers/_integration/sipgate_io.coffee
View file

@ -47,7 +47,7 @@ class Form extends App.Controller
config config
setConfig: (value) -> setConfig: (value) ->
App.Setting.set('sipgate_config', value) App.Setting.set('sipgate_config', value, {notify: true})
render: => render: =>
@config = @currentConfig() @config = @currentConfig()

2
app/assets/javascripts/app/controllers/dashboard.coffee
View file

@ -45,7 +45,7 @@ class App.Dashboard extends App.Controller
mayBeClues: => mayBeClues: =>
return if !@clueAccess return if !@clueAccess
return if !@activeState return if !@shown
return if @Config.get('switch_back_to_possible') return if @Config.get('switch_back_to_possible')
preferences = @Session.get('preferences') preferences = @Session.get('preferences')
@clueAccess = false @clueAccess = false

6
app/assets/javascripts/app/models/setting.coffee
View file

@ -12,6 +12,12 @@ class App.Setting extends App.Model
setting.state_current.value = value setting.state_current.value = value
if !options.done if !options.done
options.done = -> options.done = ->
if options.notify
App.Event.trigger 'notify', {
type: 'success'
msg: App.i18n.translateContent('Update successful!')
timeout: 2000
}
App.Setting.preferencesPost(@) App.Setting.preferencesPost(@)
if !options.fail if !options.fail