The branch, master has been updated via 4ab8e3f3390e9b983b42f8bf6512535b01b30d94 (commit) via 62cb0f85b0e818f24d0e777c309bf82d1a7f2ba5 (commit) from 310466c489603511a1a615db8e36f1714e249bcd (commit)

- Log ----------------------------------------------------------------- commit 4ab8e3f3390e9b983b42f8bf6512535b01b30d94 Author: unknown <Tyron@.(none)> Date: Fri May 27 19:30:13 2011 +0200

Don't show initials table for 20 privs or less

commit 62cb0f85b0e818f24d0e777c309bf82d1a7f2ba5 Author: unknown <Tyron@.(none)> Date: Fri May 27 19:25:33 2011 +0200

Don't show 5 second long success message when reloading privs

-----------------------------------------------------------------------

Summary of changes: js/server_privileges.js | 4 ++-- server_privileges.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/server_privileges.js b/js/server_privileges.js index 8b9c5e9..314663f 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -241,11 +241,11 @@ $(document).ready(function() { $("#reload_privileges_anchor.ajax").live("click", function(event) { event.preventDefault();

- PMA_ajaxShowMessage(PMA_messages['strReloadingPrivileges']); + var $msgbox = PMA_ajaxShowMessage(PMA_messages['strReloadingPrivileges']);

$.get($(this).attr("href"), {'ajax_request': true}, function(data) { if(data.success == true) { - PMA_ajaxShowMessage(data.message); + PMA_ajaxRemoveMessage($msgbox); } else { PMA_ajaxShowMessage(data.error); diff --git a/server_privileges.php b/server_privileges.php index ec2f0a7..2cc6bdc 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -1549,10 +1549,10 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs

/** * Displays the initials - * In an Ajax request, we don't need to show this + * In an Ajax request, we don't need to show this. Also not necassary if there is less than 20 privileges */

- if( $GLOBALS['is_ajax_request'] != true ) { + if( $GLOBALS['is_ajax_request'] != true && PMA_DBI_num_rows($res) > 20 ) {

// initialize to FALSE the letters A-Z for ($letter_counter = 1; $letter_counter < 27; $letter_counter++) {

hooks/post-receive