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/05/27 13:57:38 UTC
[06/50] [abbrv] allura git commit: [#6107] ticket:748 Change email
address to noreply@ if email posting is not allowed
[#6107] ticket:748 Change email address to noreply@ if email posting is not allowed
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/a887e247
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/a887e247
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/a887e247
Branch: refs/heads/ib/7868
Commit: a887e2476363cbc93f65203d8102190ff8c23e04
Parents: 17fe263
Author: Aleksey 'LXj' Alekseyev <go...@gmail.com>
Authored: Sun Apr 26 23:14:16 2015 +0300
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Wed Apr 29 09:40:23 2015 +0000
----------------------------------------------------------------------
ForgeDiscussion/forgediscussion/model/forum.py | 7 ++++++-
ForgeTracker/forgetracker/model/ticket.py | 6 +++++-
ForgeWiki/forgewiki/model/wiki.py | 6 +++++-
3 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/a887e247/ForgeDiscussion/forgediscussion/model/forum.py
----------------------------------------------------------------------
diff --git a/ForgeDiscussion/forgediscussion/model/forum.py b/ForgeDiscussion/forgediscussion/model/forum.py
index 5545cf0..d255c47 100644
--- a/ForgeDiscussion/forgediscussion/model/forum.py
+++ b/ForgeDiscussion/forgediscussion/model/forum.py
@@ -20,6 +20,7 @@ import logging
from itertools import chain
import pymongo
+from pylons import tmpl_context as c
from ming import schema
from ming.utils import LazyProperty
from ming.orm import FieldProperty, RelationProperty, ForeignIdProperty, Mapper
@@ -78,7 +79,11 @@ class Forum(M.Discussion):
def email_address(self):
domain = '.'.join(
reversed(self.app.url[1:-1].split('/'))).replace('_', '-')
- return '%s@%s%s' % (self.shortname.replace('/', '.'), domain, config.common_suffix)
+ if c.app.config.options.get('AllowEmailPosting', True):
+ local_part = self.shortname.replace('/', '.')
+ else:
+ local_part = 'noreply'
+ return '%s@%s%s' % (local_part, domain, config.common_suffix)
@LazyProperty
def announcements(self):
http://git-wip-us.apache.org/repos/asf/allura/blob/a887e247/ForgeTracker/forgetracker/model/ticket.py
----------------------------------------------------------------------
diff --git a/ForgeTracker/forgetracker/model/ticket.py b/ForgeTracker/forgetracker/model/ticket.py
index e26f57a..e22a2b5 100644
--- a/ForgeTracker/forgetracker/model/ticket.py
+++ b/ForgeTracker/forgetracker/model/ticket.py
@@ -764,7 +764,11 @@ class Ticket(VersionedArtifact, ActivityObject, VotableArtifact):
def email_address(self):
domain = '.'.join(
reversed(self.app.url[1:-1].split('/'))).replace('_', '-')
- return '%s@%s%s' % (self.ticket_num, domain, config.common_suffix)
+ if c.app.config.options.get('AllowEmailPosting', True):
+ local_part = self.ticket_num
+ else:
+ local_part = 'noreply'
+ return '%s@%s%s' % (local_part, domain, config.common_suffix)
@property
def email_subject(self):
http://git-wip-us.apache.org/repos/asf/allura/blob/a887e247/ForgeWiki/forgewiki/model/wiki.py
----------------------------------------------------------------------
diff --git a/ForgeWiki/forgewiki/model/wiki.py b/ForgeWiki/forgewiki/model/wiki.py
index c79fd16..79bd698 100644
--- a/ForgeWiki/forgewiki/model/wiki.py
+++ b/ForgeWiki/forgewiki/model/wiki.py
@@ -160,7 +160,11 @@ class Page(VersionedArtifact, ActivityObject):
def email_address(self):
domain = '.'.join(
reversed(self.app.url[1:-1].split('/'))).replace('_', '-')
- return '%s@%s%s' % (self.title.replace('/', '.'), domain, config.common_suffix)
+ if context.app.config.options.get('AllowEmailPosting', True):
+ local_part = self.title.replace('/', '.')
+ else:
+ local_part = 'noreply'
+ return '%s@%s%s' % (local_part, domain, config.common_suffix)
@property
def email_subject(self):