incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [07/40] git commit: [#6646] ticket:456 fixed messages for mass edit
Date Wed, 30 Oct 2013 17:00:25 GMT
[#6646] ticket:456  fixed messages for mass edit


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

Branch: refs/heads/cj/6777
Commit: 4efe798893cc2a9df3fc844fc51db152ebe3f5fb
Parents: a3c1d2d
Author: Yuriy Arhipov <yuriyarhipovua@yandex.ru>
Authored: Thu Oct 24 13:29:15 2013 +0400
Committer: Cory Johns <cjohns@slashdotmedia.com>
Committed: Thu Oct 24 18:16:32 2013 +0000

----------------------------------------------------------------------
 ForgeTracker/forgetracker/model/ticket.py                          | 2 +-
 .../forgetracker/templates/tracker_widgets/mass_edit_form.html     | 2 +-
 ForgeTracker/forgetracker/tests/functional/test_root.py            | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4efe7988/ForgeTracker/forgetracker/model/ticket.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/model/ticket.py b/ForgeTracker/forgetracker/model/ticket.py
index ed62cb0..9dff7a4 100644
--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -344,7 +344,7 @@ class Globals(MappedClass):
         for ticket in tickets:
             message = ''
             if labels:
-                values['labels'] = self.check_labels(ticket.labels, labels.split(','))
+                values['labels'] = self.check_labels(ticket.labels[:], labels.split(','))
             for k, v in sorted(values.iteritems()):
                 if k == 'assigned_to_id':
                     new_user = User.query.get(_id=v)

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4efe7988/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit_form.html
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit_form.html b/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit_form.html
index a50a608..bb20728 100644
--- a/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit_form.html
+++ b/ForgeTracker/forgetracker/templates/tracker_widgets/mass_edit_form.html
@@ -46,7 +46,7 @@
       {{c.user_select.display(name='assigned_to', id='assigned_to', value='', className='wide')}}
     </div>
     <div style="clear: both"></div>
-    <div class="grid-6">
+    <div class="grid-18">
         <label class="cr">Labels:</label>
         {{c.label_edit.display(name='labels', className='wide')}}
     </div>

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/4efe7988/ForgeTracker/forgetracker/tests/functional/test_root.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tests/functional/test_root.py b/ForgeTracker/forgetracker/tests/functional/test_root.py
index 720be41..04aae18 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -357,6 +357,8 @@ class TestFunctionalController(TrackerTestController):
         assert_equal(ticket1.labels, ['tag2', 'tag3'])
         assert_equal(ticket2.labels, ['tag1', 'tag2', 'tag3'])
         assert_equal(ticket3.labels, ['tag1', 'tag2', 'tag3'])
+        r = self.app.get('/p/test/bugs/2/')
+        assert '<li><strong>Labels</strong>: tag1 --&gt; tag1tag2tag3</li>'
in r
 
     def test_mass_edit_custom_fields(self):
         params = dict(


Mime
View raw message