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 2015/05/15 18:07:54 UTC
[14/14] allura git commit: [#6107] ticket:770 Add
Artifact.email_domain; Refactor email_address
[#6107] ticket:770 Add Artifact.email_domain; Refactor email_address
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/7ee69bf9
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/7ee69bf9
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/7ee69bf9
Branch: refs/heads/master
Commit: 7ee69bf9a18bc57302b202dcc956400a6b69c71b
Parents: 66b78e4
Author: Igor Bondarenko <je...@gmail.com>
Authored: Fri May 15 11:36:10 2015 +0000
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Fri May 15 11:36:10 2015 +0000
----------------------------------------------------------------------
Allura/allura/model/artifact.py | 6 ++++++
Allura/allura/model/repository.py | 4 +---
ForgeBlog/forgeblog/model/blog.py | 3 +--
ForgeDiscussion/forgediscussion/model/forum.py | 3 +--
ForgeTracker/forgetracker/model/ticket.py | 3 +--
ForgeWiki/forgewiki/model/wiki.py | 3 +--
6 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/7ee69bf9/Allura/allura/model/artifact.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/artifact.py b/Allura/allura/model/artifact.py
index b338572..32ebc10 100644
--- a/Allura/allura/model/artifact.py
+++ b/Allura/allura/model/artifact.py
@@ -257,6 +257,12 @@ class Artifact(MappedClass, SearchIndexable):
return 'mailto:%s' % self.email_address
@property
+ def email_domain(self):
+ """Return domain part of email address for this Artifact"""
+ url = self.app.url[1:-1].split('/')
+ return '.'.join(reversed(url)).replace('_', '-')
+
+ @property
def project(self):
"""Return the :class:`allura.model.project.Project` instance to which
this Artifact belongs.
http://git-wip-us.apache.org/repos/asf/allura/blob/7ee69bf9/Allura/allura/model/repository.py
----------------------------------------------------------------------
diff --git a/Allura/allura/model/repository.py b/Allura/allura/model/repository.py
index 8455395..e4583e5 100644
--- a/Allura/allura/model/repository.py
+++ b/Allura/allura/model/repository.py
@@ -567,9 +567,7 @@ class Repository(Artifact, ActivityObject):
@property
def email_address(self):
- domain = '.'.join(
- reversed(self.app.url[1:-1].split('/'))).replace('_', '-')
- return u'noreply@%s%s' % (domain, config.common_suffix)
+ return u'noreply@%s%s' % (self.email_domain, config.common_suffix)
def index(self):
result = Artifact.index(self)
http://git-wip-us.apache.org/repos/asf/allura/blob/7ee69bf9/ForgeBlog/forgeblog/model/blog.py
----------------------------------------------------------------------
diff --git a/ForgeBlog/forgeblog/model/blog.py b/ForgeBlog/forgeblog/model/blog.py
index 5839d76..c8426cb 100644
--- a/ForgeBlog/forgeblog/model/blog.py
+++ b/ForgeBlog/forgeblog/model/blog.py
@@ -186,8 +186,7 @@ class BlogPost(M.VersionedArtifact, ActivityObject):
@property
def email_address(self):
if self.config.options.get('AllowEmailPosting', True):
- domain = '.'.join(
- reversed(self.app.url[1:-1].split('/'))).replace('_', '-')
+ domain = self.email_domain
return '%s@%s%s' % (self.title.replace('/', '.'), domain, config.common_suffix)
else:
return tg_config.get('forgemail.return_path')
http://git-wip-us.apache.org/repos/asf/allura/blob/7ee69bf9/ForgeDiscussion/forgediscussion/model/forum.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/model/forum.py b/ForgeDiscussion/forgediscussion/model/forum.py
index d4ad197..96e570d 100644
--- a/ForgeDiscussion/forgediscussion/model/forum.py
+++ b/ForgeDiscussion/forgediscussion/model/forum.py
@@ -80,8 +80,7 @@ class Forum(M.Discussion):
@property
def email_address(self):
if c.app.config.options.get('AllowEmailPosting', True):
- domain = '.'.join(
- reversed(self.app.url[1:-1].split('/'))).replace('_', '-')
+ domain = self.email_domain
local_part = self.shortname.replace('/', '.')
return '%s@%s%s' % (local_part, domain, config.common_suffix)
else:
http://git-wip-us.apache.org/repos/asf/allura/blob/7ee69bf9/ForgeTracker/forgetracker/model/ticket.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/model/ticket.py b/ForgeTracker/forgetracker/model/ticket.py
index 32cb56d..925a067 100644
--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -765,8 +765,7 @@ class Ticket(VersionedArtifact, ActivityObject, VotableArtifact):
if self.discussion_disabled:
return tg_config.get('forgemail.return_path')
if c.app.config.options.get('AllowEmailPosting', True):
- domain = '.'.join(
- reversed(self.app.url[1:-1].split('/'))).replace('_', '-')
+ domain = self.email_domain
return '%s@%s%s' % (self.ticket_num, domain, config.common_suffix)
else:
return tg_config.get('forgemail.return_path')
http://git-wip-us.apache.org/repos/asf/allura/blob/7ee69bf9/ForgeWiki/forgewiki/model/wiki.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/model/wiki.py b/ForgeWiki/forgewiki/model/wiki.py
index 827a104..2ca4f8f 100644
--- a/ForgeWiki/forgewiki/model/wiki.py
+++ b/ForgeWiki/forgewiki/model/wiki.py
@@ -161,8 +161,7 @@ class Page(VersionedArtifact, ActivityObject):
@property
def email_address(self):
if context.app.config.options.get('AllowEmailPosting', True):
- domain = '.'.join(
- reversed(self.app.url[1:-1].split('/'))).replace('_', '-')
+ domain = self.email_domain
return '%s@%s%s' % (self.title.replace('/', '.'), domain, config.common_suffix)
else:
return tg_config.get('forgemail.return_path')