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:30 UTC
[03/21] git commit: [#4299] ticket:281 Added controller to retrieve
all users in the project via ajax
[#4299] ticket:281 Added controller to retrieve all users in the project via ajax
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/8427b1ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/8427b1ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/8427b1ff
Branch: refs/heads/master
Commit: 8427b1ffa10e478e58c2e705d446976344a04325
Parents: 70af6ba
Author: Igor Bondarenko <je...@gmail.com>
Authored: Fri Mar 1 11:04:05 2013 +0000
Committer: Tim Van Steenburgh <tv...@gmail.com>
Committed: Fri Mar 22 21:55:15 2013 +0000
----------------------------------------------------------------------
Allura/allura/controllers/project.py | 9 +++++++++
Allura/allura/tests/functional/test_home.py | 11 +++++++++++
2 files changed, 20 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/8427b1ff/Allura/allura/controllers/project.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/project.py b/Allura/allura/controllers/project.py
index 646f9d7..e687cd0 100644
--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -380,6 +380,15 @@ class ProjectController(object):
id=u.username)
for u in users])
+ @expose('json:')
+ def users(self):
+ return {
+ 'users': [{
+ 'value': u.username,
+ 'label': '%s (%s)' % (u.display_name, u.username)
+ } for u in c.project.users()]
+ }
+
class ScreenshotsController(object):
@expose()
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/8427b1ff/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 6685809..cdd131f 100644
--- a/Allura/allura/tests/functional/test_home.py
+++ b/Allura/allura/tests/functional/test_home.py
@@ -5,6 +5,8 @@ from allura.tests import TestController
from allura.tests import decorators as td
from allura import model as M
+from nose.tools import assert_equal
+
class TestProjectHome(TestController):
@@ -45,3 +47,12 @@ class TestProjectHome(TestController):
def test_user_search_shortparam(self):
r = self.app.get('/p/test/user_search?term=ad', status=400)
+
+ def test_users(self):
+ r = self.app.get('/p/test/users', status=200)
+ j = json.loads(r.body)
+ expected = [{
+ 'value': u'test-admin',
+ 'label': u'Test Admin (test-admin)'
+ }]
+ assert_equal(j['users'], expected)