You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by he...@apache.org on 2016/03/08 22:35:18 UTC
[9/9] allura git commit: [#8051] Add url for file attachments
[#8051] Add url for file attachments
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/80e402e5
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/80e402e5
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/80e402e5
Branch: refs/heads/master
Commit: 80e402e53a8b564e788ffc73b054eaa6e50ec793
Parents: 9493717
Author: Heith Seewald <he...@gmail.com>
Authored: Tue Mar 8 16:32:34 2016 -0500
Committer: Heith Seewald <he...@gmail.com>
Committed: Tue Mar 8 16:33:38 2016 -0500
----------------------------------------------------------------------
Allura/allura/model/discuss.py | 1 +
ForgeBlog/forgeblog/tests/test_app.py | 1 -
ForgeTracker/forgetracker/model/ticket.py | 1 +
ForgeWiki/forgewiki/model/wiki.py | 1 +
4 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/80e402e5/Allura/allura/model/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/discuss.py b/Allura/allura/model/discuss.py
index 921b059..dff6509 100644
--- a/Allura/allura/model/discuss.py
+++ b/Allura/allura/model/discuss.py
@@ -176,6 +176,7 @@ class Thread(Artifact, ActivityObject):
def attachment_for_export(self, page):
return [dict(bytes=attach.length,
+ url=h.absurl(attach.url()),
path=os.path.join(
self.artifact.app_config.options.mount_point,
str(self.artifact._id),
http://git-wip-us.apache.org/repos/asf/allura/blob/80e402e5/ForgeBlog/forgeblog/tests/test_app.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/tests/test_app.py b/ForgeBlog/forgeblog/tests/test_app.py
index 313f074..e043929 100644
--- a/ForgeBlog/forgeblog/tests/test_app.py
+++ b/ForgeBlog/forgeblog/tests/test_app.py
@@ -109,7 +109,6 @@ class TestBulkExport(object):
post.discussion_thread._id,
list(post.discussion_thread.post_class().query.find())[0].slug
)
- print blog['posts'][0]['discussion_thread']['posts'][0]
assert_equal(blog['posts'][0]['discussion_thread']['posts'][0]
['attachments'][0]['path'], file_path)
assert os.path.exists(os.path.join(temp_dir, file_path))
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/allura/blob/80e402e5/ForgeTracker/forgetracker/model/ticket.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/model/ticket.py b/ForgeTracker/forgetracker/model/ticket.py
index dde75ca..b355262 100644
--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -1109,6 +1109,7 @@ class Ticket(VersionedArtifact, ActivityObject, VotableArtifact):
def attachments_for_export(self):
return [dict(bytes=attach.length,
+ url=h.absurl(attach.url()),
path=os.path.join(
self.app_config.options.mount_point,
str(self._id),
http://git-wip-us.apache.org/repos/asf/allura/blob/80e402e5/ForgeWiki/forgewiki/model/wiki.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/model/wiki.py b/ForgeWiki/forgewiki/model/wiki.py
index 5b14618..f045802 100644
--- a/ForgeWiki/forgewiki/model/wiki.py
+++ b/ForgeWiki/forgewiki/model/wiki.py
@@ -126,6 +126,7 @@ class Page(VersionedArtifact, ActivityObject):
def attachments_for_export(self):
return [dict(bytes=attach.length,
+ url=h.absurl(attach.url()),
path=os.path.join(
self.app_config.options.mount_point,
str(self._id),