# HG changeset patch # User RhodeCode Admin # Date 2021-12-03 14:21:17 # Node ID 55b7721d1ef16799c9b2a529a3bc88614c1ea2d1 # Parent 90c1bb1156c7062d55fa7833af101e2215744fe5 drafts: show TODO drafts properly. - Fixes #5668 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 @@ -66,7 +66,7 @@ % endif % else: ## SKIP TODOs we display them in other area - % if comment_obj.is_todo: + % if comment_obj.is_todo and not comment_obj.draft: <% display = 'none' %> % endif ## Skip outdated comments @@ -122,12 +122,21 @@ 'review_status': (comment_obj.review_status or '') }) + icon = '' + if comment_obj.outdated: - icon = 'icon-comment-toggle' + icon += ' icon-comment-toggle' elif comment_obj.is_inline: - icon = 'icon-code' + icon += ' icon-code' else: - icon = 'icon-comment' + icon += ' icon-comment' + + if comment_obj.draft: + if comment_obj.is_todo: + icon = 'icon-flag-filled icon-draft' + else: + icon = 'icon-comment icon-draft' + %> <%= $.timeago(datetime) %> <% if (is_todo) { %> -
+
Resolve TODO diff --git a/rhodecode/templates/pullrequests/pullrequest_show.mako b/rhodecode/templates/pullrequests/pullrequest_show.mako --- a/rhodecode/templates/pullrequests/pullrequest_show.mako +++ b/rhodecode/templates/pullrequests/pullrequest_show.mako @@ -564,7 +564,6 @@ - ${_('Drafts')} ${_('Submit')}