aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorStas Vilchik <vilchiks@gmail.com>2015-06-03 13:48:44 +0200
committerStas Vilchik <vilchiks@gmail.com>2015-06-03 13:48:59 +0200
commit73c9ef7cd4d33feeede26793c515a65730f6feaf (patch)
tree24047c413957bbfbb8489cc4040dd6d4b0e1d4ec /server
parent472bf5b76470b9a1b1f13b12e6a3edd24a6df315 (diff)
downloadsonarqube-73c9ef7cd4d33feeede26793c515a65730f6feaf.tar.gz
sonarqube-73c9ef7cd4d33feeede26793c515a65730f6feaf.zip
remove unused issues code
Diffstat (limited to 'server')
-rw-r--r--server/sonar-web/src/main/js/apps/issues/workspace-list-item-view.js3
-rw-r--r--server/sonar-web/src/main/js/components/issue/issue-view.js92
-rw-r--r--server/sonar-web/src/main/js/components/issue/models/issue.js9
3 files changed, 11 insertions, 93 deletions
diff --git a/server/sonar-web/src/main/js/apps/issues/workspace-list-item-view.js b/server/sonar-web/src/main/js/apps/issues/workspace-list-item-view.js
index 6d3df9c6901..002fafb0709 100644
--- a/server/sonar-web/src/main/js/apps/issues/workspace-list-item-view.js
+++ b/server/sonar-web/src/main/js/apps/issues/workspace-list-item-view.js
@@ -87,8 +87,7 @@ define([
var key = this.model.get('key'),
componentUuid = this.model.get('componentUuid'),
index = this.model.get('index');
- this.model.clear({ silent: true });
- this.model.set({ key: key, componentUuid: componentUuid, index: index }, { silent: true });
+ this.model.reset({ key: key, componentUuid: componentUuid, index: index }, { silent: true });
return this.model.fetch(options).done(function () {
return that.trigger('reset');
});
diff --git a/server/sonar-web/src/main/js/components/issue/issue-view.js b/server/sonar-web/src/main/js/components/issue/issue-view.js
index 1b166bb87df..d7c90ddb777 100644
--- a/server/sonar-web/src/main/js/components/issue/issue-view.js
+++ b/server/sonar-web/src/main/js/components/issue/issue-view.js
@@ -25,15 +25,6 @@ define([
'change': 'render'
},
- ui: {
- tagsChange: '.js-issue-edit-tags',
- tagInput: '.issue-tag-input',
- tagsEdit: '.issue-tag-edit',
- tagsEditDone: '.issue-tag-edit-done',
- tagsEditCancel: '.issue-tag-edit-cancel',
- tagsList: '.issue-tag-list'
- },
-
events: function () {
return {
'click .js-issue-comment': 'comment',
@@ -52,7 +43,6 @@ define([
},
onRender: function () {
- this.ui.tagsEdit.hide();
this.$el.attr('data-key', this.model.get('key'));
},
@@ -68,11 +58,7 @@ define([
var that = this;
var key = this.model.get('key'),
componentUuid = this.model.get('componentUuid');
- this.model.clear({ silent: true });
- this.model.set({
- key: key,
- componentUuid: componentUuid
- }, { silent: true });
+ this.model.reset({ key: key, componentUuid: componentUuid }, { silent: true });
return this.model.fetch(options).done(function () {
return that.trigger('reset');
});
@@ -255,82 +241,6 @@ define([
this.popup.render();
},
- changeTags: function () {
- var that = this;
- return jQuery.ajax({
- url: baseUrl + '/api/issues/tags?ps=0'
- }).done(function (r) {
- if (that.ui.tagInput.select2) {
- that.ui.tagInput.select2({
- tags: _.difference(r.tags, that.model.get('tags')),
- width: '300px'
- });
- }
- if (that.ui.tagsEdit.show) {
- that.ui.tagsEdit.show();
- }
- if (that.ui.tagsList.hide) {
- that.ui.tagsList.hide();
- }
- that.tagsBuffer = that.ui.tagInput.select2('val');
- var keyScope = key.getScope();
- if (keyScope !== 'tags') {
- that.previousKeyScope = keyScope;
- }
- key.setScope('tags');
- key('escape', 'tags', function () {
- return that.cancelEdit();
- });
- that.$('.select2-input').keyup(function (event) {
- if (event.which === 27) {
- return that.cancelEdit();
- }
- });
- that.ui.tagInput.select2('focus');
- });
- },
-
- cancelEdit: function () {
- this.resetKeyScope();
- if (this.ui.tagsList.show) {
- this.ui.tagsList.show();
- }
- if (this.ui.tagInput.select2) {
- this.ui.tagInput.select2('val', this.tagsBuffer);
- this.ui.tagInput.select2('close');
- }
- if (this.ui.tagsEdit.hide) {
- return this.ui.tagsEdit.hide();
- }
- },
-
- editDone: function () {
- var that = this;
- this.resetKeyScope();
- var _tags = this.model.get('tags'),
- tags = this.ui.tagInput.val(),
- splitTags = tags ? tags.split(',') : null;
- this.model.set('tags', splitTags);
- return $.post(baseUrl + '/api/issues/set_tags', {
- key: this.model.get('key'),
- tags: tags
- }).done(function () {
- that.cancelEdit();
- }).fail(function () {
- that.model.set('tags', _tags);
- }).always(function () {
- that.render();
- });
- },
-
- resetKeyScope: function () {
- key.unbind('escape', 'tags');
- if (this.previousKeyScope) {
- key.setScope(this.previousKeyScope);
- this.previousKeyScope = null;
- }
- },
-
serializeData: function () {
var issueKey = encodeURIComponent(this.model.get('key'));
return _.extend(Marionette.ItemView.prototype.serializeData.apply(this, arguments), {
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 af5dd980c27..74ca2f3ad19 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
@@ -41,6 +41,15 @@ define(function () {
var xhr = options.xhr = Backbone.ajax(opts);
model.trigger('request', model, xhr, options);
return xhr;
+ },
+
+ reset: function (attrs, options) {
+ for (var key in this.attributes) {
+ if (this.attributes.hasOwnProperty(key) && !(key in attrs)) {
+ attrs[key] = void 0;
+ }
+ }
+ return this.set(attrs, options);
}
});