From 2b1f374217ecbc177d0cab4bb2adae7212ce10b1 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Fri, 24 Jan 2014 13:51:48 +0600
Subject: [PATCH] New Issues Page: update templates

---
 .../issues/templates/_issue_detail.hbs.erb    | 27 ++++++++-----
 .../_issue_detail_comment_form.hbs.erb        |  3 +-
 .../navigator/handlebars-extensions.js        |  7 ++--
 .../webapp/javascripts/navigator/issues.js    | 38 ++++++++++++++++++-
 4 files changed, 59 insertions(+), 16 deletions(-)

diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail.hbs.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail.hbs.erb
index efd9132cd5f..27f6129169d 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail.hbs.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail.hbs.erb
@@ -1,12 +1,12 @@
 <script id="issue-detail-template" type="text/x-handlebars-template">
   <div class="source_title">
-    <div class="subtitle">{{project.longName}}</div>
+    <div class="subtitle">{{projectLongName}}</div>
     <span class="h1">
-      <a href="<%= ApplicationController.root_context -%>{{dashboardUrl component}}">{{component}}</a>
+      <a href="<%= ApplicationController.root_context -%>{{dashboardUrl component componentQualifier}}">{{componentLongName}}</a>
     </span>
   </div>
 
-  <div class="code-issue" data-issue-key="{{key}}" data-issue-component="{{component.key}}" data-issue-rule="{{rule.key}}">
+  <div class="code-issue" data-issue-key="{{key}}" data-issue-component="{{component}}" data-issue-rule="{{rule}}">
     <div class="code-issue-name">
       {{severityIcon severity}}&nbsp;<span class="rulename">{{ruleName}}</span>
     </div>
@@ -82,11 +82,11 @@
           {{/if}}
           <li>
             <div class="code-issue-details-term"><%= message('created') -%></div>
-            <div class="code-issue-details-value">{{creationDate}}</div>
+            <div class="code-issue-details-value">{{fCreationDate}}</div>
           </li>
           <li>
             <div class="code-issue-details-term"><%= message('updated') -%></div>
-            <div class="code-issue-details-value">{{updateDate}}</div>
+            <div class="code-issue-details-value">{{fUpdateDate}}</div>
           </li>
         </ul>
       </div>
@@ -103,11 +103,11 @@
           <tbody>
           {{#each changelog}}
             <tr>
-              <td class="thin left top">{{creationDate}}</td>
+              <td class="left top">{{fCreationDate}}</td>
               <td class="thin left top">{{userName}}</td>
               <td class="left top">
                 {{#each diffs}}
-                  {{key}}: from "{{oldValue}}" to "{{newValue}}"
+                  {{this}}<br>
                 {{/each}}
               </td>
             </tr>
@@ -123,7 +123,14 @@
           <h4>
             <%= image_tag('reviews/comment.png') -%>
             <b>{{userName}}</b>
-            ({{creationDate}})
+            ({{fCreationDate}})
+
+            {{#if updatable}}
+              &nbsp;<%= image_tag 'sep12.png' -%>&nbsp;
+              <a class="link-action issue-comment-edit"><%= message('edit') -%></a>
+              <a class="link-action spacer-right issue-comment-delete"
+                 data-confirm-msg="<%= h message('issue.comment.delete_confirm_message') -%>"><%= message('delete') -%></a>
+            {{/if}}
           </h4>
           {{{html}}}
         </div>
@@ -140,7 +147,9 @@
       {{#inArray actions "assign"}}
         <li>
           <a id="issue-assign" class="link-action"><%= message('issue.assign.formlink') -%></a>
-          [<a id="issue-assign-to-me" class="link-action"><%= message('issue.assign.to_me') -%></a>]
+          {{#inArray actions "assign_to_me"}}
+            [<a id="issue-assign-to-me" class="link-action"><%= message('issue.assign.to_me') -%></a>]
+          {{/inArray}}
         </li>
       {{/inArray}}
 
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_comment_form.hbs.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_comment_form.hbs.erb
index 3d191d487e5..0b1c4540f7f 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_comment_form.hbs.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/issues/templates/_issue_detail_comment_form.hbs.erb
@@ -2,7 +2,8 @@
   <table class="width100">
     <tr>
       <td style="vertical-align:top" colspan="2">
-        <textarea id="issue-comment-text" rows="4" name="text" style="width: 100%" autofocus></textarea>
+        <textarea id="issue-comment-text" rows="4" name="text"
+                  style="width: 100%" autofocus>{{raw}}</textarea>
       </td>
     </tr>
     <tr>
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 60ae8336665..d8f059ffb40 100644
--- a/sonar-server/src/main/webapp/javascripts/navigator/handlebars-extensions.js
+++ b/sonar-server/src/main/webapp/javascripts/navigator/handlebars-extensions.js
@@ -32,12 +32,11 @@
     } else {
       return options.inverse(this);
     }
-
   });
 
-  Handlebars.registerHelper('dashboardUrl', function(component) {
-    var url = '/dashboard/index/' + decodeURIComponent(component.key);
-    if (component.qualifier === 'FIL' || component.qualifier === 'CLA') {
+  Handlebars.registerHelper('dashboardUrl', function(componentKey, componentQualifier) {
+    var url = '/dashboard/index/' + decodeURIComponent(componentKey);
+    if (componentQualifier === 'FIL' || componentQualifier === 'CLA') {
       url += '?metric=sqale_index';
     }
     return url;
diff --git a/sonar-server/src/main/webapp/javascripts/navigator/issues.js b/sonar-server/src/main/webapp/javascripts/navigator/issues.js
index 6fea1eaaea0..31f80cd3974 100644
--- a/sonar-server/src/main/webapp/javascripts/navigator/issues.js
+++ b/sonar-server/src/main/webapp/javascripts/navigator/issues.js
@@ -389,7 +389,7 @@ jQuery(function() {
         type: 'POST',
         url: baseUrl + '/api/issues/add_comment',
         data: {
-          issue: this.model.get('key'),
+          issue: this.options.issue.get('key'),
           text: text
         }
       }).done(function() {
@@ -411,6 +411,8 @@ jQuery(function() {
 
     events: {
       'click #issue-comment': 'comment',
+      'click .issue-comment-edit': 'editComment',
+      'click .issue-comment-delete': 'deleteComment',
       'click .issue-transition': 'transition'
     },
 
@@ -452,13 +454,45 @@ jQuery(function() {
 
     comment: function() {
       var commentFormView = new IssueDetailCommentFormView({
-        model: this.model,
+        issue: this.model,
         detailView: this
       });
       this.showActionView(commentFormView);
     },
 
 
+    editComment: function(e) {
+      var that = this,
+          commentKey = jQuery(e.target).closest('[data-comment-key]').data('comment-key'),
+          comment = _.findWhere(this.model.get('comments'), { key: commentKey });
+
+      console.log(comment);
+
+      var commentFormView = new IssueDetailCommentFormView({
+        model: new Backbone.Model(comment),
+        issue: this.model,
+        detailView: this
+      });
+      this.showActionView(commentFormView);
+    },
+
+
+    deleteComment: function(e) {
+      var that = this,
+          commentKey = jQuery(e.target).closest('[data-comment-key]').data('comment-key'),
+          confirmMsg = jQuery(e.target).data('confirm-msg');
+
+      if (confirm(confirmMsg)) {
+        $j.ajax({
+          type: "POST",
+          url: baseUrl + "/issue/delete_comment?id=" + commentKey,
+        }).done(function() {
+              that.updateAfterAction(true);
+            });
+      }
+    },
+
+
     transition: function(e) {
       var that = this;
       jQuery.ajax({
-- 
2.39.5