From 7752306cec2794c3f43cc959b821eb7a185de58c Mon Sep 17 00:00:00 2001 From: Stas Vilchik Date: Wed, 29 Jul 2015 15:12:18 +0200 Subject: [PATCH] SONAR-6742 Stop displaying plugin actions for issues --- .../common/handlebars-extensions.js | 18 -------------- .../main/js/components/issue/issue-view.js | 24 ------------------- .../issue/templates/issue-more-actions.hbs | 9 ------- .../js/components/issue/templates/issue.hbs | 8 ------- 4 files changed, 59 deletions(-) delete mode 100644 server/sonar-web/src/main/js/components/issue/templates/issue-more-actions.hbs diff --git a/server/sonar-web/src/main/js/components/common/handlebars-extensions.js b/server/sonar-web/src/main/js/components/common/handlebars-extensions.js index bf4e49be9f2..e8e8c13f3e9 100644 --- a/server/sonar-web/src/main/js/components/common/handlebars-extensions.js +++ b/server/sonar-web/src/main/js/components/common/handlebars-extensions.js @@ -18,8 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ (function () { - var defaultActions = ['comment', 'assign', 'assign_to_me', 'plan', 'set_severity', 'set_tags']; - Handlebars.registerHelper('log', function () { var args = Array.prototype.slice.call(arguments, 0, -1); console.log.apply(console, args); @@ -374,22 +372,6 @@ return numeral(number).format(format); }); - Handlebars.registerHelper('pluginActions', function (actions, options) { - var pluginActions = _.difference(actions, defaultActions); - return pluginActions.reduce(function (prev, current) { - return prev + options.fn(current); - }, ''); - }); - - Handlebars.registerHelper('ifHasExtraActions', function (actions, options) { - var actionsLeft = _.difference(actions, defaultActions); - if (actionsLeft.length > 0) { - return options.fn(this); - } else { - return options.inverse(this); - } - }); - Handlebars.registerHelper('withFirst', function (list, options) { if (list && list.length > 0) { return options.fn(list[0]); 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 d211ab65eda..14e83e689e4 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 @@ -36,7 +36,6 @@ define([ 'click .js-issue-assign-to-me': 'assignToMe', 'click .js-issue-plan': 'plan', 'click .js-issue-show-changelog': 'showChangeLog', - 'click .js-issue-more': 'showMoreActions', 'click .js-issue-rule': 'showRule', 'click .js-issue-edit-tags': 'editTags' }; @@ -199,29 +198,6 @@ define([ }); }, - showMoreActions: function (e) { - e.stopPropagation(); - $('body').click(); - this.popup = new MoreActionsView({ - triggerEl: $(e.currentTarget), - bottomRight: true, - model: this.model, - detailView: this - }); - this.popup.render(); - }, - - action: function (action) { - var that = this; - this.disableControls(); - return $.post(baseUrl + '/api/issues/do_action', { - issue: this.model.id, - actionKey: action - }).done(function () { - that.resetIssue(); - }); - }, - showRule: function () { if (Workspace == null) { Workspace = require('components/workspace/main'); diff --git a/server/sonar-web/src/main/js/components/issue/templates/issue-more-actions.hbs b/server/sonar-web/src/main/js/components/issue/templates/issue-more-actions.hbs deleted file mode 100644 index 18917b5f9c1..00000000000 --- a/server/sonar-web/src/main/js/components/issue/templates/issue-more-actions.hbs +++ /dev/null @@ -1,9 +0,0 @@ - - -
diff --git a/server/sonar-web/src/main/js/components/issue/templates/issue.hbs b/server/sonar-web/src/main/js/components/issue/templates/issue.hbs index bc4233d51b0..930e5ca5693 100644 --- a/server/sonar-web/src/main/js/components/issue/templates/issue.hbs +++ b/server/sonar-web/src/main/js/components/issue/templates/issue.hbs @@ -102,14 +102,6 @@ class="issue-meta-label">{{t 'issue.comment.formlink' }} {{/inArray}} - - {{#ifHasExtraActions actions}} -
  • - -
  • - {{/ifHasExtraActions}} {{#inArray actions "assign_to_me"}} -- 2.39.5