Component Viewer: show project name

diff --git a/sonar-server/src/main/coffee/component-viewer/main.coffee b/sonar-server/src/main/coffee/component-viewer/main.coffee
index a060404b11750769a1743277612efe2571340f70..ea1dac32e4e9da493ada636cbcb98e394920b735 100644 (file)
--- a/sonar-server/src/main/coffee/component-viewer/main.coffee
+++ b/sonar-server/src/main/coffee/component-viewer/main.coffee
@@ -40,8 +40,10 @@ define [
 
 
     initialize: (options) ->
-      @workspace = new Backbone.Collection()
       @component = new Backbone.Model()
+      @component.set options.component if options.component?
+
+      @workspace = new Backbone.Collection()
       @workspaceView = new WorkspaceView
         collection: @workspace
         main: @

diff --git a/sonar-server/src/main/hbs/component-viewer/source.hbs b/sonar-server/src/main/hbs/component-viewer/source.hbs
index 2fd19b82ee5b002ff9bfa369b6363bd14741973a..16c6a6a022e33f10fa3dfef7f6ea2f4f6570308b 100644 (file)
--- a/sonar-server/src/main/hbs/component-viewer/source.hbs
+++ b/sonar-server/src/main/hbs/component-viewer/source.hbs
@@ -38,6 +38,10 @@
       </ul>
 
       {{qualifierIcon component.qualifier}} <span class="component-viewer-title">{{component.lname}}</span>
+      {{#if component.projectLongName}}
+        <span class="component-viewer-title-separator">—</span>
+        {{qualifierIcon 'TRK'}} <span class="component-viewer-title">{{component.projectLongName}}</span>
+      {{/if}}
 
       <a class="icon-not-favorite" href="#" onclick="toggleFav({{component.id}}, this); return false;"
          title="Click to add to favourites"></a>

diff --git a/sonar-server/src/main/js/issues/extra.js b/sonar-server/src/main/js/issues/extra.js
index a9c8069819a8f11f40c06f73cfde29a98396c61f..212b7d90aa81d61ed5eb68634712624e747e6eaf 100644 (file)
--- a/sonar-server/src/main/js/issues/extra.js
+++ b/sonar-server/src/main/js/issues/extra.js
@@ -118,33 +118,6 @@ define(
       });
 
 
-      var Rule = Backbone.Model.extend({
-
-        url: function () {
-          return baseUrl + '/api/rules/show/?key=' + this.get('key');
-        },
-
-
-        parse: function (r) {
-          return r.rule ? r.rule : r;
-        }
-      });
-
-
-      var ActionPlans = Backbone.Collection.extend({
-
-        url: function () {
-          return baseUrl + '/api/action_plans/search';
-        },
-
-
-        parse: function (r) {
-          return r.actionPlans;
-        }
-
-      });
-
-
       var IssueView = Marionette.ItemView.extend({
         template: Handlebars.compile(jQuery('#issue-template').html() || ''),
         tagName: 'li',
@@ -173,7 +146,12 @@ define(
 
           var that = this,
               app = this.options.app,
-              componentViewer = new ComponentViewer(),
+              componentViewer = new ComponentViewer({
+                component: {
+                  project: this.model.get('project'),
+                  projectLongName: this.model.get('projectLongName')
+                }
+              }),
               showCallback = function () {
                 jQuery('.navigator-details').removeClass('navigator-fetching');
                 app.detailsRegion.show(componentViewer);
@@ -193,34 +171,6 @@ define(
         },
 
 
-        fetchSource: function (view, callback) {
-          var line = this.model.get('line') || 0,
-              from = line >= 10 ? line - 10 : 0,
-              to = line + 30;
-
-          return jQuery
-              .ajax({
-                type: 'GET',
-                url: baseUrl + '/api/sources/show',
-                data: {
-                  key: this.model.get('component'),
-                  from: from,
-                  to: to,
-                  format: 'json'
-                }
-              })
-              .done(function (r) {
-                if (_.isObject(r) && r.source) {
-                  view.source = r.source;
-                }
-                if (_.isObject(r) && r.scm) {
-                  view.scm = r.scm;
-                }
-              })
-              .always(callback);
-        },
-
-
         serializeData: function () {
           var projectFilter = this.options.app.filters.findWhere({ property: 'componentRoots' }),
               singleProject = _.isArray(projectFilter.get('value')) && projectFilter.get('value').length === 1;

diff --git a/sonar-server/src/main/less/component-viewer.less b/sonar-server/src/main/less/component-viewer.less
index 13d3febd9de65fe9efd10b6a5650af2f7dbebfe5..51c2eb28d4d131fb298fa2231aa4af28a64f2485 100644 (file)
--- a/sonar-server/src/main/less/component-viewer.less
+++ b/sonar-server/src/main/less/component-viewer.less
@@ -26,6 +26,10 @@
   font-weight: bold;
 }
 
+.component-viewer-title-separator {
+  padding: 0 4px;
+}
+
 
 .component-viewer-workspace {
   display: none;