You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by tv...@apache.org on 2013/03/22 23:54:29 UTC
[02/21] git commit: [#4299] ticket:281 Refactored users controller
[#4299] ticket:281 Refactored users controller
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/5bcc6030
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/5bcc6030
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/5bcc6030
Branch: refs/heads/master
Commit: 5bcc6030f0350cffe2c1ecb7c0203ef5a88b1d6f
Parents: 1b10b49
Author: Igor Bondarenko <je...@gmail.com>
Authored: Fri Mar 1 11:30:10 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Fri Mar 22 21:55:15 2013 +0000
----------------------------------------------------------------------
Allura/allura/controllers/project.py | 2 +-
Allura/allura/tests/functional/test_home.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5bcc6030/Allura/allura/controllers/project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/project.py b/Allura/allura/controllers/project.py
index e687cd0..4dca148 100644
--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -383,7 +383,7 @@ class ProjectController(object):
@expose('json:')
def users(self):
return {
- 'users': [{
+ 'options': [{
'value': u.username,
'label': '%s (%s)' % (u.display_name, u.username)
} for u in c.project.users()]
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5bcc6030/Allura/allura/tests/functional/test_home.py
----------------------------------------------------------------------
diff --git a/Allura/allura/tests/functional/test_home.py b/Allura/allura/tests/functional/test_home.py
index cdd131f..1bb626a 100644
--- a/Allura/allura/tests/functional/test_home.py
+++ b/Allura/allura/tests/functional/test_home.py
@@ -55,4 +55,4 @@ class TestProjectHome(TestController):
'value': u'test-admin',
'label': u'Test Admin (test-admin)'
}]
- assert_equal(j['users'], expected)
+ assert_equal(j['options'], expected)