You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/11/14 00:07:36 UTC

git commit: only generate ticket edit form when edit link is there to use it

Updated Branches:
  refs/heads/db/6877 [created] bda94c832


only generate ticket edit form when edit link is there to use it


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/bda94c83
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/bda94c83
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/bda94c83

Branch: refs/heads/db/6877
Commit: bda94c8329fa36c428991d18a223448c4072b673
Parents: 2c6339a
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Wed Nov 13 23:07:27 2013 +0000
Committer: Dave Brondsema <db...@slashdotmedia.com>
Committed: Wed Nov 13 23:07:27 2013 +0000

----------------------------------------------------------------------
 ForgeTracker/forgetracker/templates/tracker/ticket.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/bda94c83/ForgeTracker/forgetracker/templates/tracker/ticket.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/ticket.html b/ForgeTracker/forgetracker/templates/tracker/ticket.html
index 1709778..34814f2 100644
--- a/ForgeTracker/forgetracker/templates/tracker/ticket.html
+++ b/ForgeTracker/forgetracker/templates/tracker/ticket.html
@@ -31,6 +31,8 @@
 
 {% block header %}#{{ticket.ticket_num}} {{ticket.summary}}{% if ticket.deleted %}<span> (deleted)</span>{% endif %}{% endblock %}
 
+{% set editable = h.has_access(ticket, 'update') and not ticket.deleted %}
+
 {% block actions %}
 <a href="{{ticket.url()}}feed.rss" title="Follow this Ticket"><b data-icon="{{g.icons['feed'].char}}" class="ico {{g.icons['feed'].css}}"></b></a>
 {% if c.user and c.user != c.user.anonymous() %}
@@ -39,7 +41,7 @@
 {% if h.has_access(ticket.app, 'admin') %}
   <a href="move" title="Move"><b data-icon="{{g.icons['pencil'].char}}" class="ico {{g.icons['pencil'].css}}"></b> Move</a>
 {% endif %}
-{% if h.has_access(ticket, 'update') and not ticket.deleted%}
+{% if editable %}
   <a href="#" title="Edit" class="edit_ticket"><b data-icon="{{g.icons['pencil'].char}}" class="ico {{g.icons['pencil'].css}}"></b> Edit</a>
   {%if h.has_access(ticket, 'delete') and not ticket.deleted%}
     <a class="post-link" href="./delete" title="Delete"><b data-icon="{{g.icons['delete'].char}}" class="ico {{g.icons['delete'].css}}" title="Delete"></b></a>
@@ -51,10 +53,12 @@
 
 {% block edit_box %}
 <div class="editbox">
+  {% if editable %}
   <div class="form_holder" style="display: none">
     {{c.ticket_form.display(action='%supdate_ticket_from_widget' % ticket.url(),
       value=ticket, ticket=ticket, show_comment=True)}}
   </div>
+  {% endif %}
   <div class="view_holder">
       {% if '_milestone' in ticket.custom_fields %}
         <div class="grid-4">