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/10/01 13:24:03 UTC
[22/27] git commit: [#7657] Add an extension point for additional
user details
[#7657] Add an extension point for additional user details
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/194555aa
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/194555aa
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/194555aa
Branch: refs/heads/master
Commit: 194555aaa843fbd880e194ae6043ae034b8cf990
Parents: d0999ca
Author: Igor Bondarenko <je...@gmail.com>
Authored: Thu Sep 18 10:48:56 2014 +0300
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Wed Oct 1 10:27:48 2014 +0000
----------------------------------------------------------------------
Allura/allura/controllers/site_admin.py | 5 +++-
Allura/allura/lib/plugin.py | 6 +++++
.../templates/site_admin_user_details.html | 24 +++++++++-----------
3 files changed, 21 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/194555aa/Allura/allura/controllers/site_admin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/site_admin.py b/Allura/allura/controllers/site_admin.py
index 271e50b..335a0e6 100644
--- a/Allura/allura/controllers/site_admin.py
+++ b/Allura/allura/controllers/site_admin.py
@@ -468,11 +468,14 @@ class AdminUserDetailsController(object):
raise HTTPNotFound()
projects = user.my_projects().all()
audit_log = self._audit_log(user, limit, page)
- return {
+ info = {
'user': user,
'projects': projects,
'audit_log': audit_log,
}
+ p = AuthenticationProvider.get(request)
+ info.update(p.user_details(user))
+ return info
def _audit_log(self, user, limit, page):
limit = int(limit)
http://git-wip-us.apache.org/repos/asf/allura/blob/194555aa/Allura/allura/lib/plugin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/plugin.py b/Allura/allura/lib/plugin.py
index 7784bd0..f7d096a 100644
--- a/Allura/allura/lib/plugin.py
+++ b/Allura/allura/lib/plugin.py
@@ -280,6 +280,12 @@ class AuthenticationProvider(object):
def get_primary_email_address(self, user_record):
return user_record.get_pref('email_address') if user_record else None
+ def user_details(self, user):
+ '''Returns detailed information about user.
+
+ :param user: a :class:`User <allura.model.auth.User>`
+ '''
+ return {}
def is_password_expired(self, user):
days = asint(config.get('auth.pwdexpire.days', 0))
http://git-wip-us.apache.org/repos/asf/allura/blob/194555aa/Allura/allura/templates/site_admin_user_details.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/site_admin_user_details.html b/Allura/allura/templates/site_admin_user_details.html
index fbbb0f4..dd771cc 100644
--- a/Allura/allura/templates/site_admin_user_details.html
+++ b/Allura/allura/templates/site_admin_user_details.html
@@ -34,6 +34,7 @@
<li>Full name: {{ user.get_pref('display_name') }}</li>
<li>Registered: {{ user.registration_date() }} ({{ h.ago(user.registration_date()) }})</li>
</ul>
+ {% block extra_general_info %}{% endblock %}
</div>
<div class="grid-6">
@@ -45,21 +46,18 @@
<input type='hidden' name='username' value='{{ user.username }}'>
{{lib.csrf_token()}}
</form>
- </div>
- <div class="grid-16"> </div>
- <div class="grid-6">
- <form action='/nf/admin/user/set_random_password' method="POST">
- <input type="submit" value="Set random password">
- <input type='hidden' name='username' value='{{ user.username }}'>
- {{lib.csrf_token()}}
- </form>
+ <form action='/nf/admin/user/set_random_password' method="POST">
+ <input type="submit" value="Set random password">
+ <input type='hidden' name='username' value='{{ user.username }}'>
+ {{lib.csrf_token()}}
+ </form>
- <form action='/nf/admin/user/send_password_reset_link' method="POST">
- <input type="submit" value="Send password reset link">
- <input type='hidden' name='username' value='{{ user.username }}'>
- {{lib.csrf_token()}}
- </form>
+ <form action='/nf/admin/user/send_password_reset_link' method="POST">
+ <input type="submit" value="Send password reset link">
+ <input type='hidden' name='username' value='{{ user.username }}'>
+ {{lib.csrf_token()}}
+ </form>
</div>
</fieldset>
</div>