[allura] branch master updated: [#8457] prevented actions from getting duplicated when a ticket is on edit mode and then canceled

[br...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

brondsem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git


The following commit(s) were added to refs/heads/master by this push:
     new 35e2eb126 [#8457] prevented actions from getting duplicated when a ticket is on edit mode and then canceled
35e2eb126 is described below

commit 35e2eb1261e5c85a957a4a6d28bf59793fd9fb65
Author: Guillermo Cruz <gu...@slashdotmedia.com>
AuthorDate: Mon Aug 29 13:18:36 2022 -0600

    [#8457] prevented actions from getting duplicated when a ticket is on edit mode and then canceled
---
 Allura/allura/templates/jinja_master/master.html            | 4 +++-
 Allura/allura/templates_responsive/jinja_master/master.html | 3 ++-
 ForgeTracker/forgetracker/templates/tracker/ticket.html     | 5 +++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Allura/allura/templates/jinja_master/master.html b/Allura/allura/templates/jinja_master/master.html
index f4d2f6b57..79659f5f8 100644
--- a/Allura/allura/templates/jinja_master/master.html
+++ b/Allura/allura/templates/jinja_master/master.html
@@ -122,7 +122,8 @@
                     {% set inner_width = outer_width %}
                 {% endif %}
                 <div class="grid-{{ outer_width }} pad">
-                    <h2 class="dark{% block header_classes %} title{% endblock %}">{% block header %}{% endblock %}
+                    <h2 class="dark{% block header_classes %} title{% endblock %}">
+                        <span>{% block header %}{% endblock %}</span>
                         <!-- actions -->
                         <small>
                             {% block actions %}{% endblock %}
@@ -172,6 +173,7 @@
     {{ c.project.neighborhood.site_specific_html | safe }}
 {% endif %}
 {{ theme_macros.custom_js() }}
+
 {% if flash %}
     <script type="text/javascript">{{ flash | safe }}</script>
 {% endif %}
diff --git a/Allura/allura/templates_responsive/jinja_master/master.html b/Allura/allura/templates_responsive/jinja_master/master.html
index 2f12bc172..defab9b84 100644
--- a/Allura/allura/templates_responsive/jinja_master/master.html
+++ b/Allura/allura/templates_responsive/jinja_master/master.html
@@ -112,7 +112,8 @@
                     {% endblock %}
                 {% endif %}
                 <div class="column">
-                    <h2 class="{% block header_classes %} title{% endblock %}">{% block header %}{% endblock %}
+                    <h2 class="{% block header_classes %} title{% endblock %}">
+                        <span>{% block header %}{% endblock %}</span>
                         <!-- actions -->
                         <small>
                             {% block actions %}{% endblock %}
diff --git a/ForgeTracker/forgetracker/templates/tracker/ticket.html b/ForgeTracker/forgetracker/templates/tracker/ticket.html
index 97f3fa18d..59bd0a3d3 100644
--- a/ForgeTracker/forgetracker/templates/tracker/ticket.html
+++ b/ForgeTracker/forgetracker/templates/tracker/ticket.html
@@ -189,6 +189,7 @@
           var discussion_holder = $('#discussion_holder');
           var ticket_content = $('#ticket_content');
           var title_holder = $('h2.dark');
+          var original_title_text = title_holder.find('span').text()
           var original_title = title_holder.html();
           var title_actions = title_holder.find('small');
           var vote = $('#vote');
@@ -203,7 +204,7 @@
             ticket_content.hide();
             title_actions.hide();
             title_actions.appendTo(document.body);
-            title_holder.text('\u00A0');
+            title_holder.find('span').text('\u00A0')
             vote.hide();
             $('div.new-ticket-title label').hide();
             $('a.edit_ticket').addClass('btn_activate');
@@ -225,7 +226,7 @@
             view_holder.show();
             discussion_holder.show();
             ticket_content.show();
-            title_holder.html(original_title);
+            title_holder.find('span').html(original_title_text)
             title_actions.appendTo(title_holder);
             title_actions.show();
             vote.show();