[#6019] Show current user first in ProjectUserCombo box
Signed-off-by: Tim Van Steenburgh <tvansteenburgh@gmail.com>
diff --git a/Allura/allura/controllers/project.py b/Allura/allura/controllers/project.py
index 6c29cad..2267dcf 100644
--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -466,11 +466,16 @@
@expose('json:')
def users(self):
+ users = c.project.users()
+ if c.user and c.user in users:
+ users.remove(c.user)
+ users.insert(0, c.user)
+
return {
'options': [{
'value': u.username,
'label': '%s (%s)' % (u.display_name, u.username)
- } for u in c.project.users()]
+ } for u in users]
}
diff --git a/ForgeWiki/forgewiki/wiki_main.py b/ForgeWiki/forgewiki/wiki_main.py
index 9193ecc..d1e02c2 100644
--- a/ForgeWiki/forgewiki/wiki_main.py
+++ b/ForgeWiki/forgewiki/wiki_main.py
@@ -525,7 +525,6 @@
else:
page = self.fake_page()
c.markdown_editor = W.markdown_editor
- c.user_select = ffw.ProjectUserSelect()
c.attachment_add = W.attachment_add
c.attachment_list = W.attachment_list
c.label_edit = W.label_edit
