SONAR-5209 Manual issues feedback

diff --git a/sonar-server/src/main/coffee/component-viewer/source.coffee b/sonar-server/src/main/coffee/component-viewer/source.coffee
index 7eae208323d3d963b60c8d993ec1bea1b8637712..f1912f56b3d0d5891112471178c5246872fbf911 100644 (file)
--- a/sonar-server/src/main/coffee/component-viewer/source.coffee
+++ b/sonar-server/src/main/coffee/component-viewer/source.coffee
@@ -274,6 +274,7 @@ define [
     serializeData: ->
       source: @prepareSource()
       settings: @options.main.settings.toJSON()
+      state: @options.main.state.toJSON()
       showSettings: @showSettings
       component: @options.main.component.toJSON()
       columns: @getStatColumnsCount() + 1

diff --git a/sonar-server/src/main/coffee/issues/manual-issue-view.coffee b/sonar-server/src/main/coffee/issues/manual-issue-view.coffee
index 728cec2dfcdd06a748a9e388824685cd84d5ec6c..4b066d0318d4ba080ff0c7dfca29c22d41e68ef9 100644 (file)
--- a/sonar-server/src/main/coffee/issues/manual-issue-view.coffee
+++ b/sonar-server/src/main/coffee/issues/manual-issue-view.coffee
@@ -25,6 +25,14 @@ define [
       @$('[name=rule]').select2
         width: '250px'
         minimumResultsForSearch: 10
+      @$('[name=rule]').select2 'open'
+      if key?
+        @key = key.getScope()
+        key.setScope ''
+
+
+    onClose: ->
+      key.setScope @key if key? && @key?
 
 
     showSpinner: ->
@@ -69,7 +77,8 @@ define [
       @$('.code-issue-errors').removeClass('hidden').text msg
 
 
-    cancel: ->
+    cancel: (e) ->
+      e.preventDefault()
       @close()
 
 

diff --git a/sonar-server/src/main/hbs/component-viewer/source.hbs b/sonar-server/src/main/hbs/component-viewer/source.hbs
index ba9fc1444ec75b682730a59d12faa563a2739d6b..616ee4608e1096faa8dce243e4cc9cd8911a66ab 100644 (file)
--- a/sonar-server/src/main/hbs/component-viewer/source.hbs
+++ b/sonar-server/src/main/hbs/component-viewer/source.hbs
@@ -60,7 +60,11 @@
           </td>
         {{/if}}
 
-        <td class="stat lid js-line-actions">{{lineNumber}}</td>
+        {{#if ../../state.canCreateManualIssue}}
+          <td class="stat lid js-line-actions" title="{{t 'component_viewer.line_actions'}}">{{lineNumber}}</td>
+        {{else}}
+          <td class="stat lid js-line-actions">{{lineNumber}}</td>
+        {{/if}}
 
         <td class="line"><pre>{{{code}}}</pre></td>
       </tr>

diff --git a/sonar-server/src/main/less/component-viewer.less b/sonar-server/src/main/less/component-viewer.less
index 0a6c4d8fcc34e29626bba471849e0f302a3148e2..3154de2111878040274c259c0597abcbfa3dd8bf 100644 (file)
--- a/sonar-server/src/main/less/component-viewer.less
+++ b/sonar-server/src/main/less/component-viewer.less
@@ -157,8 +157,8 @@
 
   .code .row-highlighted,
   .code .row-highlighted:hover {
-    td.stat { background-color: #e9e94d; }
-    td.line { background-color: #f1f1a3; }
+    td.stat { background-color: #fdf190; }
+    td.line, .code-issues, .code-issue { background-color: #fff8c2; }
   }
 
   .code td.line {