MMF-223 clean up

diff --git a/server/sonar-web/src/main/js/apps/coding-rules/app.js b/server/sonar-web/src/main/js/apps/coding-rules/app.js
index 282c5dd1cc7317936c3d79d9868757a544f6d99e..813d04b1af66c8a138936de4c28a4bcba7d10b69 100644 (file)
--- a/server/sonar-web/src/main/js/apps/coding-rules/app.js
+++ b/server/sonar-web/src/main/js/apps/coding-rules/app.js
@@ -31,7 +31,6 @@ import WorkspaceListView from './workspace-list-view';
 import WorkspaceHeaderView from './workspace-header-view';
 import FacetsView from './facets-view';
 import FiltersView from './filters-view';
-import { translate } from '../../helpers/l10n';
 
 const App = new Marionette.Application();
 const init = function () {

diff --git a/server/sonar-web/src/main/js/apps/coding-rules/filters-view.js b/server/sonar-web/src/main/js/apps/coding-rules/filters-view.js
index 8f78300993376a821fd9121b0e25921f53dfbb98..d89f9ab066139d982fcac076ab516cbb51b747ed 100644 (file)
--- a/server/sonar-web/src/main/js/apps/coding-rules/filters-view.js
+++ b/server/sonar-web/src/main/js/apps/coding-rules/filters-view.js
@@ -17,16 +17,9 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-import _ from 'underscore';
 import Marionette from 'backbone.marionette';
 import Template from './templates/coding-rules-filters.hbs';
 
 export default Marionette.ItemView.extend({
-  template: Template,
-
-  serializeData () {
-    return _.extend(Marionette.ItemView.prototype.serializeData.apply(this, arguments), {
-      canWrite: this.options.app.canWrite
-    });
-  }
+  template: Template
 });

diff --git a/server/sonar-web/src/main/js/apps/coding-rules/rule-details-view.js b/server/sonar-web/src/main/js/apps/coding-rules/rule-details-view.js
index e788c19cef2371b90837c868f6ff01aee1d929b0..dc4665ee3a5f0a1ffa04fbf554faab2fe48d5e30 100644 (file)
--- a/server/sonar-web/src/main/js/apps/coding-rules/rule-details-view.js
+++ b/server/sonar-web/src/main/js/apps/coding-rules/rule-details-view.js
@@ -154,7 +154,7 @@ export default Marionette.LayoutView.extend({
 
   serializeData () {
     const isCustom = this.model.has('templateKey');
-    const isEditable = this.options.app.canWrite && (isCustom);
+    const isEditable = this.options.app.canWrite && isCustom;
     let qualityProfilesVisible = true;
 
     if (this.model.get('isTemplate')) {

diff --git a/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-description-view.js b/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-description-view.js
index 9ed27e3238fd46467d3b754b48624b6aa1778df5..9c5c5df3bf86ed0ab40b8bc69964279d8d4418f8 100644 (file)
--- a/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-description-view.js
+++ b/server/sonar-web/src/main/js/apps/coding-rules/rule/rule-description-view.js
@@ -93,7 +93,7 @@ export default Marionette.ItemView.extend({
   },
 
   serializeData () {
-    const isEditable = this.options.app.canWrite && (this.model.get('isCustom'));
+    const isEditable = this.options.app.canWrite && this.model.get('isCustom');
 
     return _.extend(Marionette.ItemView.prototype.serializeData.apply(this, arguments), {
       isEditable,

diff --git a/server/sonar-web/src/main/js/apps/coding-rules/templates/rule/coding-rules-rule-meta.hbs b/server/sonar-web/src/main/js/apps/coding-rules/templates/rule/coding-rules-rule-meta.hbs
index 57503382826582207d4ae065af6a8aa80446a515..33919a00353d357585cb393389a07ef7644f0bb2 100644 (file)
--- a/server/sonar-web/src/main/js/apps/coding-rules/templates/rule/coding-rules-rule-meta.hbs
+++ b/server/sonar-web/src/main/js/apps/coding-rules/templates/rule/coding-rules-rule-meta.hbs
@@ -52,8 +52,8 @@
   <li class="coding-rules-detail-property">{{t 'coding_rules.available_since'}} {{d createdAt}}</li>
 
   <li class="coding-rules-detail-property"
-      data-toggle="tooltip" data-placement="bottom" title="Rule repository{(language)">
-    {{repoName}}({{langName}})
+      data-toggle="tooltip" data-placement="bottom" title="Rule repository (language)">
+    {{repoName}} ({{langName}})
   </li>
 
   {{#if isTemplate}}

diff --git a/server/sonar-web/src/main/js/components/issue/manual-issue-view.js b/server/sonar-web/src/main/js/components/issue/manual-issue-view.js
deleted file mode 100644 (file)
index bd971c2..0000000
--- a/server/sonar-web/src/main/js/components/issue/manual-issue-view.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * SonarQube
- * Copyright (C) 2009-2016 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-import $ from 'jquery';
-import _ from 'underscore';
-import Marionette from 'backbone.marionette';
-import Issue from './models/issue';
-import Template from './templates/manual-issue.hbs';
-
-export default Marionette.ItemView.extend({
-  template: Template,
-
-  events: {
-    'submit .js-manual-issue-form': 'formSubmit',
-    'click .js-cancel': 'cancel'
-  },
-
-  initialize () {
-    const that = this;
-    this.rules = [];
-    $.get('/api/rules/search?repositories=manual&f=name&ps=9999999').done(function (r) {
-      that.rules = r.rules;
-      that.render();
-    });
-  },
-
-  onRender () {
-    this.delegateEvents();
-    this.$('[name=rule]').select2({
-      width: '250px',
-      minimumResultsForSearch: 10
-    });
-    if (this.rules.length > 0) {
-      this.$('[name=rule]').select2('open');
-    }
-    if (key != null) {
-      this.key = key.getScope();
-      key.setScope('');
-    }
-  },
-
-  onDestroy () {
-    if (key != null && this.key != null) {
-      key.setScope(this.key);
-    }
-  },
-
-  formSubmit (e) {
-    const that = this;
-    e.preventDefault();
-    const issue = new Issue({
-      component: this.options.component,
-      line: this.options.line,
-      message: this.$('[name="message"]').val(),
-      rule: this.$('[name="rule"]').val()
-    });
-    issue.save().done(function () {
-      that.addIssue(issue);
-    });
-  },
-
-  addIssue (issue) {
-    const that = this;
-    return issue.fetch().done(function () {
-      that.trigger('add', issue);
-      that.destroy();
-    });
-  },
-
-  cancel (e) {
-    e.preventDefault();
-    this.destroy();
-  },
-
-  serializeData () {
-    return _.extend(Marionette.ItemView.prototype.serializeData.apply(this, arguments), {
-      rules: _.sortBy(this.rules, 'name')
-    });
-  }
-});
-
-

diff --git a/server/sonar-web/src/main/js/components/source-viewer/popups/line-actions-popup.js b/server/sonar-web/src/main/js/components/source-viewer/popups/line-actions-popup.js
index dad2d571b65c0889d3efa916d8ef5729465c2629..acb9b46be42fab2a27abeb9e5eb10626e99ec3d8 100644 (file)
--- a/server/sonar-web/src/main/js/components/source-viewer/popups/line-actions-popup.js
+++ b/server/sonar-web/src/main/js/components/source-viewer/popups/line-actions-popup.js
@@ -29,8 +29,7 @@ export default Popup.extend({
 
   getPermalink (e) {
     e.preventDefault();
-    const url = '/component/index?id=' +
-        (encodeURIComponent(this.model.key())) + '&line=' + this.options.line;
+    const url = `/component/index?id=${encodeURIComponent(this.model.key())}&line=${this.options.line}`;
     const windowParams = 'resizable=1,scrollbars=1,status=1';
     window.open(url, this.model.get('name'), windowParams);
   }