From 20d760166ebd55838d6b523423857153c09fe255 Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Fri, 27 Jun 2014 14:32:09 +0600 Subject: [PATCH] SONAR-5209 Remind decorators only on issues page (except scm) --- .../main/coffee/component-viewer/main.coffee | 22 +++++++++++-------- sonar-server/src/main/js/issues/extra.js | 3 +++ 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/sonar-server/src/main/coffee/component-viewer/main.coffee b/sonar-server/src/main/coffee/component-viewer/main.coffee index c513e2dd71d..238f6ed360d 100644 --- a/sonar-server/src/main/coffee/component-viewer/main.coffee +++ b/sonar-server/src/main/coffee/component-viewer/main.coffee @@ -81,7 +81,9 @@ define [ initialize: (options) -> @settings = new Backbone.Model @getDefaultSettings() if options.settings? + options.settings = JSON.parse(options.settings) if typeof options.settings == 'string' @settings.set options.settings + @shouldStoreSettings = options.shouldStoreSettings @state = new State() @@ -106,17 +108,19 @@ define [ getDefaultSettings: -> - componentViewerSettings = localStorage.getItem 'componentViewerSettings' - if componentViewerSettings? then JSON.parse componentViewerSettings else - issues: false - coverage: false - duplications: false - scm: false - workspace: false + scm = !!localStorage.getItem('componentViewerSCM') + issues: false + coverage: false + duplications: false + scm: scm + workspace: false storeSettings: -> - localStorage.setItem 'componentViewerSettings', JSON.stringify @settings.toJSON() + scm = if @settings.get('scm') then 'scm' else '' + localStorage.setItem 'componentViewerSCM', scm + if @shouldStoreSettings + localStorage.setItem 'componentViewerSettings', JSON.stringify @settings.toJSON() onRender: -> @@ -316,4 +320,4 @@ define [ scrollPlusDelta: (delta) -> parent = @$el.scrollParent() - parent.scrollTop delta \ No newline at end of file + parent.scrollTop delta diff --git a/sonar-server/src/main/js/issues/extra.js b/sonar-server/src/main/js/issues/extra.js index 073a8122876..ee75da84575 100644 --- a/sonar-server/src/main/js/issues/extra.js +++ b/sonar-server/src/main/js/issues/extra.js @@ -146,7 +146,10 @@ define( var that = this, app = this.options.app, + settings = localStorage.getItem('componentViewerSettings'), componentViewer = new ComponentViewer({ + settings: settings, + shouldStoreSettings: true, component: { project: this.model.get('project'), projectLongName: this.model.get('projectLongName') -- 2.39.5