From 21aebdf6400a8bdac868a07ac37bea8117a7c1de Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Sun, 8 Apr 2012 16:45:23 +0200 Subject: [PATCH] Displays AX id on admin page (Closes #1604). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Jacob --- ChangeLog | 3 +++ modules/admin.php | 2 +- templates/admin/user.tpl | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 71d2f58..9cd5745 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,9 @@ VERSION 1.1.5 XX XX XXXX Bug/Wish: + * Admin: + - #1604: Displays AX id on admin page -JAC + * Search: - #1572: Removes remaining results count from queries -JAC - #1574: Correctly displays State corps -GLN diff --git a/modules/admin.php b/modules/admin.php index 7bdd213..4fc5989 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -737,7 +737,7 @@ class AdminModule extends PLModule $page->assign('aliases', $aliases); $page->assign('account_types', XDB::iterator('SELECT * FROM account_types ORDER BY type')); $page->assign('skins', XDB::iterator('SELECT id, name FROM skins ORDER BY name')); - $page->assign('profiles', XDB::iterator('SELECT p.pid, p.hrpid, FIND_IN_SET(\'owner\', ap.perms) AS owner + $page->assign('profiles', XDB::iterator('SELECT p.pid, p.hrpid, FIND_IN_SET(\'owner\', ap.perms) AS owner, p.ax_id FROM account_profiles AS ap INNER JOIN profiles AS p ON (ap.pid = p.pid) WHERE ap.uid = {?}', $user->id())); diff --git a/templates/admin/user.tpl b/templates/admin/user.tpl index c3b7c64..b60f662 100644 --- a/templates/admin/user.tpl +++ b/templates/admin/user.tpl @@ -289,7 +289,7 @@ $(function() { - {$profile.hrpid} (pid {$profile.pid}) + {$profile.hrpid} (pid {$profile.pid}, ax_id {$profile.ax_id}) {icon name=user_edit} {icon name=user_suit} -- 2.1.4