diff options
Diffstat (limited to 'server/sonar-web/src/main/js')
3 files changed, 30 insertions, 0 deletions
diff --git a/server/sonar-web/src/main/js/apps/issues/models/issues.js b/server/sonar-web/src/main/js/apps/issues/models/issues.js index 5a5a8f3ec8b..cc617bd6eca 100644 --- a/server/sonar-web/src/main/js/apps/issues/models/issues.js +++ b/server/sonar-web/src/main/js/apps/issues/models/issues.js @@ -25,6 +25,15 @@ define([ return issue; }, + _prepareClosed: function (issue) { + if (issue.status === 'CLOSED') { + issue.secondaryLocations = []; + issue.executionFlows = []; + delete issue.textRange; + } + return issue; + }, + parseIssues: function (r) { var that = this; return r.issues.map(function (issue, index) { @@ -36,6 +45,7 @@ define([ issue = that._injectRelational(issue, r.users, 'assignee', 'login'); issue = that._injectRelational(issue, r.users, 'reporter', 'login'); issue = that._injectRelational(issue, r.actionPlans, 'actionPlan', 'key'); + issue = that._prepareClosed(issue); return issue; }); }, diff --git a/server/sonar-web/src/main/js/components/issue/collections/issues.js b/server/sonar-web/src/main/js/components/issue/collections/issues.js index 248ec44971a..e3cdca48a9e 100644 --- a/server/sonar-web/src/main/js/components/issue/collections/issues.js +++ b/server/sonar-web/src/main/js/components/issue/collections/issues.js @@ -25,6 +25,15 @@ define([ return issue; }, + _prepareClosed: function (issue) { + if (issue.status === 'CLOSED') { + issue.secondaryLocations = []; + issue.executionFlows = []; + delete issue.textRange; + } + return issue; + }, + parse: function (r) { var that = this; @@ -43,6 +52,7 @@ define([ issue = that._injectRelational(issue, r.users, 'assignee', 'login'); issue = that._injectRelational(issue, r.users, 'reporter', 'login'); issue = that._injectRelational(issue, r.actionPlans, 'actionPlan', 'key'); + issue = that._prepareClosed(issue); return issue; }); } diff --git a/server/sonar-web/src/main/js/components/issue/models/issue.js b/server/sonar-web/src/main/js/components/issue/models/issue.js index 3ee6036ca33..31f268c958a 100644 --- a/server/sonar-web/src/main/js/components/issue/models/issue.js +++ b/server/sonar-web/src/main/js/components/issue/models/issue.js @@ -27,6 +27,7 @@ define(function () { issue = this._injectRelational(issue, r.users, 'assignee', 'login'); issue = this._injectRelational(issue, r.users, 'reporter', 'login'); issue = this._injectRelational(issue, r.actionPlans, 'actionPlan', 'key'); + issue = this._prepareClosed(issue); return issue; } else { return r; @@ -49,6 +50,15 @@ define(function () { return issue; }, + _prepareClosed: function (issue) { + if (issue.status === 'CLOSED') { + issue.secondaryLocations = []; + issue.executionFlows = []; + delete issue.textRange; + } + return issue; + }, + sync: function (method, model, options) { var opts = options || {}; opts.contentType = 'application/x-www-form-urlencoded'; |