You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2014/01/02 21:33:54 UTC

[2/2] git commit: [#5749] fix HTML bug; make default be an option for new milestones

[#5749] fix HTML bug; make default be an option for new milestones


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

Branch: refs/heads/master
Commit: 515a7b1c8d860ca538bda985431438591ce1ee8c
Parents: c67efb5
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Tue Dec 17 22:30:09 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Thu Jan 2 20:33:25 2014 +0000

----------------------------------------------------------------------
 ForgeTracker/forgetracker/templates/tracker/milestones.html | 7 ++++---
 ForgeTracker/forgetracker/tracker_main.py                   | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/515a7b1c/ForgeTracker/forgetracker/templates/tracker/milestones.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker/milestones.html b/ForgeTracker/forgetracker/templates/tracker/milestones.html
index 37bd20f..3dc748c 100644
--- a/ForgeTracker/forgetracker/templates/tracker/milestones.html
+++ b/ForgeTracker/forgetracker/templates/tracker/milestones.html
@@ -42,7 +42,7 @@
     <tbody>
       {% for m in milestones %}
       <tr class="{{loop.index0%2 and 'even' or ''}}">
-        <td><input type="radio" name="milestones-{{loop.index0}}.default" class="default-milestone" disabled="disabled" {%if m.default %} checked {%endif%}>
+        <td><input type="radio" name="milestones-{{loop.index0}}.default" class="default-milestone" disabled="disabled" {%if m.default %} checked {%endif%}></td>
         <td class="view">
           <input type="hidden" name="milestones-{{loop.index0}}.old_name" value="{{m.name}}">
           <strong><a href="{{c.app.url}}milestone/{{h.urlquote(m.name)}}/">{{m.name}}</a></strong></td>
@@ -75,6 +75,9 @@
       {% set num_milestones = milestones.__len__() %}
       <tr class="new_milestone" style="display:none">
         <td>
+            <input type="radio" name="milestones-{{num_milestones}}.default" class="default-milestone">
+        </td>
+        <td>
           <input type="hidden" name="milestones-{{num_milestones}}.old_name">
           <input type="text" name="milestones-{{num_milestones}}.new_name" placeholder="Title">
         </td>
@@ -163,5 +166,3 @@
   }
 </style>
 {% endblock %}
-
-

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/515a7b1c/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index ca3587f..34267cf 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -702,7 +702,9 @@ class RootController(BaseController, FeedController):
                             name=new['new_name'],
                             description = new['description'],
                             due_date = new['due_date'],
-                            complete = new['complete'] == 'Closed'))
+                            complete = new['complete'] == 'Closed',
+                            default = new.get('default', False),
+                        ))
                         update_counts = True
         if update_counts:
             c.app.globals.invalidate_bin_counts()