# HG changeset patch
# User Marcin Kuzminski <marcin@rhodecode.com>
# Date 2020-09-27 17:33:46
# Node ID 6bf75c538ac4b6a92d721f0736ab64e04b78a6e2
# Parent  a9e68bf1c431447baab239fd23bd3a4a79e05b04

sidebar: expose status indicator for general comments which changed review status.

diff --git a/rhodecode/events/pullrequest.py b/rhodecode/events/pullrequest.py
--- a/rhodecode/events/pullrequest.py
+++ b/rhodecode/events/pullrequest.py
@@ -145,7 +145,7 @@ class PullRequestCommentEvent(PullReques
 
         status = None
         if self.comment.status_change:
-            status = self.comment.status_change[0].status
+            status = self.comment.review_status
 
         data.update({
             'comment': {
@@ -184,7 +184,7 @@ class PullRequestCommentEditEvent(PullRe
 
         status = None
         if self.comment.status_change:
-            status = self.comment.status_change[0].status
+            status = self.comment.review_status
 
         data.update({
             'comment': {
diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py
--- a/rhodecode/model/db.py
+++ b/rhodecode/model/db.py
@@ -3881,6 +3881,16 @@ class ChangesetComment(Base, BaseModel):
         return self.get_index_from_version(
             self.pull_request_version_id, versions)
 
+    @property
+    def review_status(self):
+        if self.status_change:
+            return self.status_change[0].status
+
+    @property
+    def review_status_lbl(self):
+        if self.status_change:
+            return self.status_change[0].status_lbl
+
     def __repr__(self):
         if self.comment_id:
             return '<DB:Comment #%s>' % self.comment_id
diff --git a/rhodecode/templates/base/sidebar.mako b/rhodecode/templates/base/sidebar.mako
--- a/rhodecode/templates/base/sidebar.mako
+++ b/rhodecode/templates/base/sidebar.mako
@@ -89,6 +89,7 @@
                     if is_pr:
                         version_info = (' made in older version (v{})'.format(comment_ver_index) if is_from_old_ver == 'true' else ' made in this version')
                   %>
+
                   <script type="text/javascript">
                       // closure function helper
                       var sidebarComment${comment_obj.comment_id} = function() {
@@ -101,6 +102,7 @@
                             is_todo: ${h.json.dumps(comment_obj.is_todo)},
                             created_on: "${h.format_date(comment_obj.created_on)}",
                             datetime: "${comment_obj.created_on}${h.get_timezone(comment_obj.created_on, time_is_local=True)}",
+                            review_status: "${(comment_obj.review_status or '')}"
                         })
                       }
                   </script>
diff --git a/rhodecode/templates/changeset/changeset_file_comment.mako b/rhodecode/templates/changeset/changeset_file_comment.mako
--- a/rhodecode/templates/changeset/changeset_file_comment.mako
+++ b/rhodecode/templates/changeset/changeset_file_comment.mako
@@ -76,9 +76,9 @@
                             status_change_title = 'Status of review for commit {}'.format(h.short_id(comment.commit_id))
                     %>
 
-                    <i class="icon-circle review-status-${comment.status_change[0].status}"></i>
+                    <i class="icon-circle review-status-${comment.review_status}"></i>
                     <div class="changeset-status-lbl tooltip" title="${status_change_title}">
-                         ${comment.status_change[0].status_lbl}
+                         ${comment.review_status_lbl}
                     </div>
                   % else:
                     <div>
diff --git a/rhodecode/templates/ejs_templates/templates.html b/rhodecode/templates/ejs_templates/templates.html
--- a/rhodecode/templates/ejs_templates/templates.html
+++ b/rhodecode/templates/ejs_templates/templates.html
@@ -196,6 +196,9 @@ if (show_disabled) {
             <br/>
             File: <code><%- file_name -%></code>
         <% } else { %>
+            <% if (review_status) { %>
+                <i class="icon-circle review-status-<%= review_status %>"></i>
+            <% } %>
             <strong>General</strong> TODO
             <% if (version_info) { %>
                 <%= version_info %>
@@ -210,6 +213,9 @@ if (show_disabled) {
             <br/>
             File: <code><%- file_name -%></code>
         <% } else { %>
+            <% if (review_status) { %>
+                <i class="icon-circle review-status-<%= review_status %>"></i>
+            <% } %>
             <strong>General</strong> comment
             <% if (version_info) { %>
                 <%= version_info %>