You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by ww...@apache.org on 2013/02/06 16:39:34 UTC
[1/3] git commit: [#5195] Be a little stricter in the accepted values
[#5195] Be a little stricter in the accepted values
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/46037a7d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/46037a7d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/46037a7d
Branch: refs/heads/master
Commit: 46037a7d7d2bbb1f34efb7758d2462e16012ea48
Parents: d6eb25a
Author: Patrick Lenz <pl...@geek.net>
Authored: Fri Feb 1 11:05:51 2013 +0000
Committer: Wayne Witzel III <ww...@geek.net>
Committed: Wed Feb 6 03:15:46 2013 +0000
----------------------------------------------------------------------
Allura/allura/ext/admin/admin_main.py | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/46037a7d/Allura/allura/ext/admin/admin_main.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/admin_main.py b/Allura/allura/ext/admin/admin_main.py
index 5350c96..837d09e 100644
--- a/Allura/allura/ext/admin/admin_main.py
+++ b/Allura/allura/ext/admin/admin_main.py
@@ -1,6 +1,7 @@
import logging
from collections import defaultdict
from datetime import datetime
+from urlparse import urlparse
import pkg_resources
from pylons import c, g, request
@@ -336,9 +337,11 @@ class ProjectAdminController(BaseController):
M.AuditLog.log('change project twitter handle to %s', twitter_handle)
c.project.set_social_account('Twitter', twitter_handle)
if facebook_page != c.project.social_account('Facebook'):
- h.log_action(log, 'change project facebook page').info('')
- M.AuditLog.log('change project facebook page to %s', facebook_page)
- c.project.set_social_account('Facebook', facebook_page)
+ parsed = urlparse(facebook_page)
+ if 'facebook.com' in parsed.netloc:
+ h.log_action(log, 'change project facebook page').info('')
+ M.AuditLog.log('change project facebook page to %s', facebook_page)
+ c.project.set_social_account('Facebook', facebook_page)
if support_page_url != c.project.support_page_url:
h.log_action(log, 'change project support page url').info('')
M.AuditLog.log('change project support page url to %s', support_page_url)