New Issues Page: fix display of actions/transitions

2 files changed, 27 insertions, 3 deletions

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb
index 072431442bc..93d2300f280 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_inner.hbs.erb
@@ -152,6 +152,12 @@
           </li>
         {{/inArray}}
 
+        {{#withFirst transitions}}
+          <li>
+            <a class="link-action issue-transition" data-transition="{{this}}">{{translate "transitions" this}}</a>
+          </li>
+        {{/withFirst}}
+
         {{#ifHasExtraActions actions transitions}}
           <li>
             <div class="dropdown">
@@ -167,11 +173,11 @@
                     <a class="link-action spacer-right issue-action" data-action="{{this}}">{{translate "actions" this}}</a>
                   </li>
                 {{/pluginActions}}
-                {{#each transitions}}
+                {{#withoutFirst transitions}}
                   <li>
                     <a class="link-action spacer-right issue-transition" data-transition="{{this}}">{{translate "transitions" this}}</a>
                   </li>
-                {{/each}}
+                {{/withoutFirst}}
               </ul>
             </div>
           </li>
diff --git a/sonar-server/src/main/webapp/javascripts/navigator/handlebars-extensions.js b/sonar-server/src/main/webapp/javascripts/navigator/handlebars-extensions.js
index 49b8c14f08c..5ba6df2cdc3 100644
--- a/sonar-server/src/main/webapp/javascripts/navigator/handlebars-extensions.js
+++ b/sonar-server/src/main/webapp/javascripts/navigator/handlebars-extensions.js
@@ -74,13 +74,31 @@
 
   Handlebars.registerHelper('ifHasExtraActions', function(actions, transitions, options) {
     var actionsLeft = _.difference(actions, _.without(defaultActions, 'set_severity'));
-    if (actionsLeft.length > 0 || transitions.length > 0) {
+    if (actionsLeft.length > 0 || transitions.length > 1) {
       return options.fn(this);
     } else {
       return '';
     }
   });
 
+  Handlebars.registerHelper('withFirst', function(list, options) {
+    if (list && list.length > 0) {
+      return options.fn(list[0]);
+    } else {
+      return '';
+    }
+  });
+
+  Handlebars.registerHelper('withoutFirst', function(list, options) {
+    if (list && list.length > 1) {
+      return list.slice(1).reduce(function(prev, current) {
+        return prev + options.fn(current);
+      }, '');
+    } else {
+      return '';
+    }
+  });
+
   Handlebars.registerHelper('sources', function(source, scm, options) {
     var sources = _.map(source, function(code, line) {
       return {