提交: 4f0cf252fce513b6000ad493543b31c69f1b0c64 - allura (git)

allura

Commit MetaInfo

• 修訂: 4f0cf252fce513b6000ad493543b31c69f1b0c64 (tree)
• 時間: 2010-10-25 23:02:00
• 作者: Jenny Steele <jsteele@geek...>
• Commiter: Jenny Steele

Log Message

[#1072] Better fix for ticket view extra row

Change Summary

• modified: ForgeTracker/forgetracker/templates/tracker/ticket.html

差異

--- a/ForgeTracker/forgetracker/templates/tracker/ticket.html
+++ b/ForgeTracker/forgetracker/templates/tracker/ticket.html
@@ -61,7 +61,8 @@
         {% endfor %}
       </div>
     </div>
-    {% if globals.custom_fields %}
+    {% set min_c_fields = '_milestone' in ticket.custom_fields and 1 or 0 %}
+    {% if globals.custom_fields and globals.custom_fields.__len__() > min_c_fields %}
     <div class="row">
       {% set cf_count=0 %}
       {% for field in globals.custom_fields or [] %}
@@ -147,6 +148,7 @@
             ticket_content.hide();
             title_holder.text('\u00A0');
             $('a.edit_ticket').addClass('btn_activate');
+            $('textarea.ticket_form.description').focus()
             return false;
           });
           $('a.cancel_form').click(function(){
@@ -170,15 +172,6 @@
           $('.editbox a').click(function(event){
             event.stopPropagation();
           });
-
-            // Hack for demo, to be removed
-            // must figure out why this extra row is created and fix by not creating it
-            $('div.row:not(:has(div))').remove();
-
-            // Hack for demo, to be removed
-            // cancel button and save button should be the same kind of HTML element
-            // this hack adjusts the height of the cancel link to match the save button
-            $('a.cancel_form').css('line-height', '16px');
         });
     </script>
   {% endif %}