提交: cf12fe05528f87acbdafe55ab1e9aec05719a6fb - allura (git)

allura

Commit MetaInfo

• 修订版: cf12fe05528f87acbdafe55ab1e9aec05719a6fb (tree)
• 时间: 2010-10-13 01:58:50
• 作者: Jenny Steele <jsteele@geek...>
• Commiter: Jenny Steele

Log Message

Fix for labels

更改概述

• modified: Allura/allura/lib/widgets/templates/label_edit.html
• modified: ForgeTracker/forgetracker/model/ticket.py
• modified: ForgeTracker/forgetracker/tests/functional/test_root.py
• modified: ForgeTracker/forgetracker/tracker_main.py

差异

--- a/Allura/allura/lib/widgets/templates/label_edit.html
+++ b/Allura/allura/lib/widgets/templates/label_edit.html
@@ -1,3 +1,3 @@
 <div>
-  <input id="{{name}}" name="{{name}}" type="text" value="{{value or ''}}" class="label_edit {{className}}" />
+  <input id="{{name}}" name="{{name}}" type="text" value="{{value and ','.join(value) or ''}}" class="label_edit {{className}}" />
 </div>

--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -353,10 +353,10 @@ class Ticket(VersionedArtifact):
 
     def update(self,ticket_form):
         self.globals.invalidate_bin_counts()
-        tags = (ticket_form.pop('tags', None) or '').split(',')
+        tags = (ticket_form.pop('tags', None) or '')
         if tags == ['']:
             tags = []
-        labels = (ticket_form.pop('labels', None) or '').split(',')
+        labels = (ticket_form.pop('labels', None) or '')
         if labels == ['']:
             labels = []
         self.labels = labels

--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -114,8 +114,7 @@ class TestFunctionalController(TestController):
             'status':'ccc',
             'milestone':'',
             'assigned_to':'',
-            'labels-0':'yellow',
-            'labels-1':'green',
+            'labels':'yellow,green',
             'labels_old':'yellow,green'
         })
         response = self.app.get('/bugs/1/')
@@ -127,7 +126,7 @@ class TestFunctionalController(TestController):
             'status':'ccc',
             'milestone':'',
             'assigned_to':'',
-            'labels-0':'yellow',
+            'labels':'yellow',
             'labels_old':'yellow'
         })
         response = self.app.get('/bugs/1/')

--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -699,6 +699,10 @@ class TicketController(BaseController):
             flash('You must provide a Name')
             redirect('.')
         c.app.globals.invalidate_bin_counts()
+        if 'labels' in post_data:
+            post_data['labels'] = post_data['labels'].split(',')
+        else:
+            post_data['labels'] = []
         self._update_ticket(post_data)
 
     @expose()