SONAR-4366 Quality Gates: prepare for the permissions stuff

diff --git a/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-condition-view.coffee b/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-condition-view.coffee
index 72f1d4abd0ed8a7abb950a785be3ce6e93323447..6f417be31b5f0f1b72bc3b2dc277ec471fad1a33 100644 (file)
--- a/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-condition-view.coffee
+++ b/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-condition-view.coffee
@@ -103,7 +103,8 @@ define [
 
 
     serializeData: ->
+      period = _.findWhere(window.SS.metricPeriods, key: '' + this.model.get('period'))
       _.extend super,
         canEdit: @options.app.canEdit
         periods: window.SS.metricPeriods
-        periodText: _.findWhere(window.SS.metricPeriods, key: '' + this.model.get('period')).text
+        periodText: period?.text

diff --git a/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-condition-view.js b/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-condition-view.js
index 1b7c39ee4214f50dde608e19cbc78656559ffe9f..e7426777ee85c4b8601c464b85291685ce49baae 100644 (file)
--- a/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-condition-view.js
+++ b/sonar-server/src/main/webapp/javascripts/quality-gate/views/quality-gate-detail-condition-view.js
@@ -123,12 +123,14 @@
       };
 
       QualityGateDetailConditionView.prototype.serializeData = function() {
+        var period;
+        period = _.findWhere(window.SS.metricPeriods, {
+          key: '' + this.model.get('period')
+        });
         return _.extend(QualityGateDetailConditionView.__super__.serializeData.apply(this, arguments), {
           canEdit: this.options.app.canEdit,
           periods: window.SS.metricPeriods,
-          periodText: _.findWhere(window.SS.metricPeriods, {
-            key: '' + this.model.get('period')
-          }).text
+          periodText: period != null ? period.text : void 0
         });
       };