incubator-allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From john...@apache.org
Subject [19/22] git commit: [#5656] ticket:353 changed flash message and subject
Date Tue, 28 May 2013 19:27:53 GMT
[#5656]  ticket:353 changed flash message and subject


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

Branch: refs/heads/cj/6218
Commit: 6c1eeccf177a521187cd060cf317e515eb86f732
Parents: 224499a
Author: Yuriy Arhipov <yuriyarhipovua@yandex.ru>
Authored: Mon May 20 14:53:02 2013 +0400
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Fri May 24 18:42:27 2013 +0000

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


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6c1eeccf/ForgeTracker/forgetracker/model/ticket.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/model/ticket.py b/ForgeTracker/forgetracker/model/ticket.py
index 3a6803d..80a8eb2 100644
--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -242,7 +242,7 @@ class Globals(MappedClass):
         mail = dict(
             fromaddr = str(c.user.email_address_header()),
             reply_to = str(c.user.email_address_header()),
-            subject = '%s:%s Mass ticket moving by %s' % (c.project.shortname,
+            subject = '[%s:%s] Mass ticket moving by %s' % (c.project.shortname,
                                                           c.app.config.options.mount_point,
                                                           c.user.display_name))
         tmpl = g.jinja2_env.get_template('forgetracker:data/mass_move_report.html')

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6c1eeccf/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 37b3399..0d129a3 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -2321,7 +2321,7 @@ class TestBulkMove(TrackerTestController):
         emails = M.MonQTask.query.find(dict(task_name='allura.tasks.mail_tasks.sendmail')).all()
         assert_equal(len(emails), 3)
         for email in emails:
-            assert_equal(email.kwargs.subject, 'test:bugs Mass ticket moving by Test Admin')
+            assert_equal(email.kwargs.subject, '[test:bugs] Mass ticket moving by Test Admin')
         first_user_email = M.MonQTask.query.find({
             'task_name': 'allura.tasks.mail_tasks.sendmail',
             'kwargs.destinations': str(first_user._id)
@@ -2376,7 +2376,7 @@ class TestBulkMove(TrackerTestController):
         emails = M.MonQTask.query.find(dict(task_name='allura.tasks.mail_tasks.sendmail')).all()
         assert_equal(len(emails), 2)
         for email in emails:
-            assert_equal(email.kwargs.subject, 'test:bugs Mass ticket moving by Test Admin')
+            assert_equal(email.kwargs.subject, '[test:bugs] Mass ticket moving by Test Admin')
         admin_email = M.MonQTask.query.find({
             'task_name': 'allura.tasks.mail_tasks.sendmail',
             'kwargs.destinations': str(M.User.by_username('test-admin')._id)

http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/6c1eeccf/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index 62469a9..1534f55 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -829,7 +829,7 @@ class RootController(BaseController, FeedController):
         c.app.globals.invalidate_bin_counts()
         ThreadLocalORMSession.flush_all()
         count = len(tickets)
-        flash('Moved {} ticket{}'.format(count, 's' if count != 1 else ''), 'ok')
+        flash('Move scheduled ({} ticket{})'.format(count, 's' if count != 1 else ''), 'ok')
         redirect('move/' + search)
 
     @expose()


Mime
View raw message