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/22 12:28:09 UTC
[28/31] 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/b897ee0c
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/b897ee0c
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/b897ee0c
Branch: refs/heads/je/42cc_7657b
Commit: b897ee0c09d4423ce3d74c2e6cc5a37a394f8f77
Parents: 1e41d95
Author: Igor Bondarenko <je...@gmail.com>
Authored: Thu Sep 18 10:48:56 2014 +0300
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Mon Sep 22 11:14:57 2014 +0300
----------------------------------------------------------------------
Allura/allura/controllers/site_admin.py | 5 +++-
Allura/allura/lib/plugin.py | 7 ++++++
.../templates/site_admin_user_details.html | 24 +++++++++-----------
3 files changed, 22 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/b897ee0c/Allura/allura/controllers/site_admin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/site_admin.py b/Allura/allura/controllers/site_admin.py
index 688aefb..8c94d46 100644
--- a/Allura/allura/controllers/site_admin.py
+++ b/Allura/allura/controllers/site_admin.py
@@ -465,11 +465,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/b897ee0c/Allura/allura/lib/plugin.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/plugin.py b/Allura/allura/lib/plugin.py
index 1186cf6..1ad4ef0 100644
--- a/Allura/allura/lib/plugin.py
+++ b/Allura/allura/lib/plugin.py
@@ -277,6 +277,13 @@ class AuthenticationProvider(object):
'''
raise NotImplementedError, 'get_last_password_updated'
+ 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))
before = asint(config.get('auth.pwdexpire.before', 0))
http://git-wip-us.apache.org/repos/asf/allura/blob/b897ee0c/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>