You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/04/09 16:05:39 UTC
[1/3] allura git commit: [#6017] ticket:751 Add attachment
information to ticket changelog entries
Repository: allura
Updated Branches:
refs/heads/ib/6017 [created] 03c8bcce3
[#6017] ticket:751 Add attachment information to ticket changelog entries
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/4fea341b
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/4fea341b
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/4fea341b
Branch: refs/heads/ib/6017
Commit: 4fea341b6dfccb05c09bb653be4575e1d68ce550
Parents: 80736cc
Author: Aleksey 'LXj' Alekseyev <go...@gmail.com>
Authored: Tue Apr 7 17:22:16 2015 +0300
Committer: Aleksey 'LXj' Alekseyev <go...@gmail.com>
Committed: Tue Apr 7 17:22:16 2015 +0300
----------------------------------------------------------------------
ForgeTracker/forgetracker/tracker_main.py | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/4fea341b/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index aedf6ff..ce89ac2 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -1387,6 +1387,14 @@ class TicketController(BaseController, FeedController):
@require_post()
def _update_ticket(self, post_data):
+ def attachments_info(attachments):
+ text = ''
+ for attach in attachments:
+ text = "%s %s (%s; %s) " % (
+ text, attach.filename,
+ h.do_filesizeformat(attach.length), attach.content_type)
+ return text
+
require_access(self.ticket, 'update')
changes = changelog()
comment = post_data.pop('comment', None)
@@ -1414,7 +1422,9 @@ class TicketController(BaseController, FeedController):
if 'attachment' in post_data:
attachment = post_data['attachment']
+ changes['attachments'] = attachments_info(self.ticket.attachments)
self.ticket.add_multiple_attachments(attachment)
+ changes['attachments'] = attachments_info(self.ticket.attachments)
for cf in c.app.globals.custom_fields or []:
if 'custom_fields.' + cf.name in post_data:
value = post_data['custom_fields.' + cf.name]
[2/3] allura git commit: [#6017] ticket:751 Clear Ming's cache for
attachments to generate a changelog
Posted by je...@apache.org.
[#6017] ticket:751 Clear Ming's cache for attachments to generate a changelog
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/03c5fb6d
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/03c5fb6d
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/03c5fb6d
Branch: refs/heads/ib/6017
Commit: 03c5fb6d6a20a7d04d7772cf74e8dc8ad8d768fd
Parents: 4fea341
Author: Igor Bondarenko <je...@gmail.com>
Authored: Wed Apr 8 10:10:02 2015 +0000
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Wed Apr 8 10:10:02 2015 +0000
----------------------------------------------------------------------
ForgeTracker/forgetracker/tracker_main.py | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/03c5fb6d/ForgeTracker/forgetracker/tracker_main.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/tracker_main.py b/ForgeTracker/forgetracker/tracker_main.py
index ce89ac2..1cadd97 100644
--- a/ForgeTracker/forgetracker/tracker_main.py
+++ b/ForgeTracker/forgetracker/tracker_main.py
@@ -38,6 +38,7 @@ from bson.errors import InvalidId
from webhelpers import feedgenerator as FG
from ming import schema
+from ming.odm import session
from ming.orm.ormsession import ThreadLocalORMSession
from ming.utils import LazyProperty
@@ -1424,6 +1425,11 @@ class TicketController(BaseController, FeedController):
attachment = post_data['attachment']
changes['attachments'] = attachments_info(self.ticket.attachments)
self.ticket.add_multiple_attachments(attachment)
+ # flush new attachments to db
+ session(self.ticket.attachment_class()).flush()
+ # self.ticket.attachments is ming's LazyProperty, we need to reset
+ # it's cache to fetch updated attachments here:
+ self.ticket.__dict__.pop('attachments')
changes['attachments'] = attachments_info(self.ticket.attachments)
for cf in c.app.globals.custom_fields or []:
if 'custom_fields.' + cf.name in post_data:
[3/3] allura git commit: [#6017] ticket:751 Fixed test
Posted by je...@apache.org.
[#6017] ticket:751 Fixed test
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/03c8bcce
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/03c8bcce
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/03c8bcce
Branch: refs/heads/ib/6017
Commit: 03c8bcce3275edaf52f7a2c5bae8e34ee8f217c1
Parents: 03c5fb6
Author: Aleksey 'LXj' Alekseyev <go...@gmail.com>
Authored: Wed Apr 8 14:51:39 2015 +0300
Committer: Aleksey 'LXj' Alekseyev <go...@gmail.com>
Committed: Wed Apr 8 14:51:39 2015 +0300
----------------------------------------------------------------------
ForgeTracker/forgetracker/tests/functional/test_root.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/03c8bcce/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 b2c5c11..b8fec09 100644
--- a/ForgeTracker/forgetracker/tests/functional/test_root.py
+++ b/ForgeTracker/forgetracker/tests/functional/test_root.py
@@ -753,7 +753,7 @@ class TestFunctionalController(TrackerTestController):
'delete': 'True'
})
deleted_form = self.app.get('/bugs/1/')
- assert file_name not in deleted_form
+ assert file_link not in deleted_form
def test_delete_attachment_from_comments(self):
ticket_view = self.new_ticket(summary='test ticket').follow()