You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2014/09/18 09:29:59 UTC
[24/43] git commit: [#7656] ticket:648 Add default search fields for
user & additional fields examples
[#7656] ticket:648 Add default search fields for user & additional fields examples
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/462be293
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/462be293
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/462be293
Branch: refs/heads/je/42cc_7656
Commit: 462be2937c8db06c50fd59ad92b3a84f70e8aec9
Parents: 278f041
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue Sep 9 14:24:39 2014 +0300
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Thu Sep 18 09:33:57 2014 +0300
----------------------------------------------------------------------
Allura/allura/controllers/site_admin.py | 2 +-
Allura/development.ini | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/462be293/Allura/allura/controllers/site_admin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/site_admin.py b/Allura/allura/controllers/site_admin.py
index b19b84b..40c69f2 100644
--- a/Allura/allura/controllers/site_admin.py
+++ b/Allura/allura/controllers/site_admin.py
@@ -358,7 +358,7 @@ class SiteAdminController(object):
limit=validators.Int(if_invalid=None),
page=validators.Int(if_empty=0, if_invalid=0)))
def search_users(self, q=None, f=None, page=0, limit=None, **kw):
- fields = []
+ fields = [('username', 'username'), ('display_name', 'display name')]
add_fields = aslist(tg.config.get('search.user.additional_fields'), ',')
r = self._search(M.User, fields, add_fields, q, f, page, limit, **kw)
r['search_results_template'] = 'allura:templates/site_admin_search_users_results.html'
http://git-wip-us.apache.org/repos/asf/allura/blob/462be293/Allura/development.ini
----------------------------------------------------------------------
diff --git a/Allura/development.ini b/Allura/development.ini
index 80275d5..ab0c114 100644
--- a/Allura/development.ini
+++ b/Allura/development.ini
@@ -120,9 +120,10 @@ user_prefs_storage.method = local
user_prefs_storage.ldap.fields.display_name = cn
-# Additional fields for admin project search (/nf/admin/search_projects/)
+# Additional fields for admin project/user search
# Note: whitespace after comma is important!
# search.project.additional_fields = private, url, title
+# search.user.additional_fields = email_addresses
# Set the locations of some static resources
# script_name is the path that is handled by the application