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 2013/05/24 19:05:08 UTC
[32/50] git commit: [#4831] ticket:339 Use singular form in log
messages
[#4831] ticket:339 Use singular form in log messages
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/67488c04
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/67488c04
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/67488c04
Branch: refs/heads/db/6255
Commit: 67488c0464eae5a8c375c61d46959776fc275ca5
Parents: 99a2fe0
Author: Igor Bondarenko <je...@gmail.com>
Authored: Thu May 23 10:48:19 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Thu May 23 14:29:11 2013 +0000
----------------------------------------------------------------------
Allura/allura/app.py | 2 +-
Allura/allura/tests/functional/test_admin.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/67488c04/Allura/allura/app.py
----------------------------------------------------------------------
diff --git a/Allura/allura/app.py b/Allura/allura/app.py
index 466f355..21099a1 100644
--- a/Allura/allura/app.py
+++ b/Allura/allura/app.py
@@ -523,7 +523,7 @@ class DefaultAdminController(BaseController):
del_group_ids.append(str(acl['role_id']))
if new_group_ids or del_group_ids:
- model.AuditLog.log('updated "%s" permissions: "%s" => "%s" for %s' % (
+ model.AuditLog.log('updated "%s" permission: "%s" => "%s" for %s' % (
perm,
', '.join(map(lambda id: model.ProjectRole.query.get(_id=ObjectId(id)).name, group_ids+del_group_ids)),
', '.join(map(lambda id: model.ProjectRole.query.get(_id=ObjectId(id)).name, group_ids+new_group_ids)),
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/67488c04/Allura/allura/tests/functional/test_admin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_admin.py b/Allura/allura/tests/functional/test_admin.py
index a2bcceb..9741d3c 100644
--- a/Allura/allura/tests/functional/test_admin.py
+++ b/Allura/allura/tests/functional/test_admin.py
@@ -394,13 +394,13 @@ class TestProjectAdmin(TestController):
assert opt_admin.name == 'option'
assert opt_developer.name == 'option'
- with audits('updated "admin" permissions: "Admin" => "Admin, Developer" for wiki'):
+ with audits('updated "admin" permission: "Admin" => "Admin, Developer" for wiki'):
self.app.post('/admin/wiki/update', params={
'card-0.new': opt_developer['value'],
'card-0.value': opt_admin['value'],
'card-0.id': 'admin'})
- with audits('updated "admin" permissions: "Admin, Developer" => "Admin" for wiki'):
+ with audits('updated "admin" permission: "Admin, Developer" => "Admin" for wiki'):
self.app.post('/admin/wiki/update', params={
'card-0.value': opt_admin['value'],
'card-0.id': 'admin'})