You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2016/05/23 15:14:07 UTC
[1/3] allura git commit: [#8077] Removed code duplication in
artifact.py and Renamed icon_url to author_icon_url in API
Repository: allura
Updated Branches:
refs/heads/master 212c359bb -> 4dc36d238
[#8077] Removed code duplication in artifact.py and Renamed icon_url to author_icon_url in API
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/4dc36d23
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/4dc36d23
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/4dc36d23
Branch: refs/heads/master
Commit: 4dc36d23850fdf5975c62d179b64c7c6dfad0532
Parents: 672003b
Author: Rohan Verma <ro...@gmail.com>
Authored: Fri May 20 21:50:06 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Mon May 23 11:04:53 2016 -0400
----------------------------------------------------------------------
Allura/allura/model/artifact.py | 4 ----
Allura/allura/model/discuss.py | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/4dc36d23/Allura/allura/model/artifact.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/artifact.py b/Allura/allura/model/artifact.py
index d750518..0d177ce 100644
--- a/Allura/allura/model/artifact.py
+++ b/Allura/allura/model/artifact.py
@@ -682,10 +682,6 @@ class Message(Artifact):
from .auth import User
return User.query.get(_id=self.author_id) or User.anonymous()
- def author_icon_url(self):
- from .auth import User
- return User.query.get(_id=self.author_id).icon_url()
-
def index(self):
result = Artifact.index(self)
author = self.author()
http://git-wip-us.apache.org/repos/asf/allura/blob/4dc36d23/Allura/allura/model/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/discuss.py b/Allura/allura/model/discuss.py
index 313c912..25510c8 100644
--- a/Allura/allura/model/discuss.py
+++ b/Allura/allura/model/discuss.py
@@ -200,7 +200,7 @@ class Thread(Artifact, ActivityObject):
text=p.text,
subject=p.subject,
author=p.author().username,
- icon_url=p.author_icon_url(),
+ author_icon_url=h.absurl(p.author().icon_url()),
timestamp=p.timestamp,
last_edited=p.last_edit_date,
attachments=self.attachment_for_export(p) if is_export else self.attachemtns_for_json(p))
[3/3] allura git commit: [#8077] Added icon_url in API response
Posted by br...@apache.org.
[#8077] Added icon_url in API response
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/665a1a24
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/665a1a24
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/665a1a24
Branch: refs/heads/master
Commit: 665a1a24c4aa2e5fec2890590a3b46432aa07cbb
Parents: 212c359
Author: Rohan Verma <ro...@gmail.com>
Authored: Wed May 18 02:05:44 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Mon May 23 11:04:53 2016 -0400
----------------------------------------------------------------------
Allura/allura/model/artifact.py | 4 ++++
Allura/allura/model/discuss.py | 1 +
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/665a1a24/Allura/allura/model/artifact.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/artifact.py b/Allura/allura/model/artifact.py
index 0d177ce..ba3912a 100644
--- a/Allura/allura/model/artifact.py
+++ b/Allura/allura/model/artifact.py
@@ -682,6 +682,10 @@ class Message(Artifact):
from .auth import User
return User.query.get(_id=self.author_id) or User.anonymous()
+ def icon_url(self):
+ from .auth import User
+ return User.query.get(_id=self.author_id).icon_url()
+
def index(self):
result = Artifact.index(self)
author = self.author()
http://git-wip-us.apache.org/repos/asf/allura/blob/665a1a24/Allura/allura/model/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/discuss.py b/Allura/allura/model/discuss.py
index 36dc160..65797fe 100644
--- a/Allura/allura/model/discuss.py
+++ b/Allura/allura/model/discuss.py
@@ -200,6 +200,7 @@ class Thread(Artifact, ActivityObject):
text=p.text,
subject=p.subject,
author=p.author().username,
+ icon_url=p.icon_url(),
timestamp=p.timestamp,
last_edited=p.last_edit_date,
attachments=self.attachment_for_export(p) if is_export else self.attachemtns_for_json(p))
[2/3] allura git commit: [#8077] Fixed naming of author_icon_url to
be accurate with what the method does
Posted by br...@apache.org.
[#8077] Fixed naming of author_icon_url to be accurate with what the method does
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/672003be
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/672003be
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/672003be
Branch: refs/heads/master
Commit: 672003be3f7feb13f345f08da3a5306baa4262f2
Parents: 665a1a2
Author: Rohan Verma <ro...@gmail.com>
Authored: Fri May 20 04:09:13 2016 +0530
Committer: Dave Brondsema <da...@brondsema.net>
Committed: Mon May 23 11:04:53 2016 -0400
----------------------------------------------------------------------
Allura/allura/model/artifact.py | 2 +-
Allura/allura/model/discuss.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/672003be/Allura/allura/model/artifact.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/artifact.py b/Allura/allura/model/artifact.py
index ba3912a..d750518 100644
--- a/Allura/allura/model/artifact.py
+++ b/Allura/allura/model/artifact.py
@@ -682,7 +682,7 @@ class Message(Artifact):
from .auth import User
return User.query.get(_id=self.author_id) or User.anonymous()
- def icon_url(self):
+ def author_icon_url(self):
from .auth import User
return User.query.get(_id=self.author_id).icon_url()
http://git-wip-us.apache.org/repos/asf/allura/blob/672003be/Allura/allura/model/discuss.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/discuss.py b/Allura/allura/model/discuss.py
index 65797fe..313c912 100644
--- a/Allura/allura/model/discuss.py
+++ b/Allura/allura/model/discuss.py
@@ -200,7 +200,7 @@ class Thread(Artifact, ActivityObject):
text=p.text,
subject=p.subject,
author=p.author().username,
- icon_url=p.icon_url(),
+ icon_url=p.author_icon_url(),
timestamp=p.timestamp,
last_edited=p.last_edit_date,
attachments=self.attachment_for_export(p) if is_export else self.attachemtns_for_json(p))