[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-301-ge7d9457

[Marc Delisle]

The branch, master has been updated
       via  e7d9457431c6249334724958ef28832626aa4913 (commit)
      from  2817ebe8e9b69c3ad7d29cfdb5a7ba8c7a949e13 (commit)


- Log -----------------------------------------------------------------
commit e7d9457431c6249334724958ef28832626aa4913
Author: Marc Delisle <marc at infomarc.info>
Date:   Sat Jan 15 09:23:57 2011 -0500

    rfe #3158867 [privileges] No DROP DATABASE warning if you delete a user

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

Summary of changes:
 ChangeLog               |    1 +
 js/server_privileges.js |   14 ++++++++++++++
 2 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 60985a1..3a7d64f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -129,6 +129,7 @@
   table even when phpMyAdmin configuration storage is not active
 - bug #3141327 [relation] Foreign key input options
 - [export] Better handling of export to PHP array.
+- rfe #3158867 [privileges] No DROP DATABASE warning if you delete a user
 
 3.3.10.0 (not yet released)
 - patch #3147400 [structure] Aria table size printed as unknown,
diff --git a/js/server_privileges.js b/js/server_privileges.js
index f2458f7..1cf87ce 100644
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -440,6 +440,20 @@ $(document).ready(function() {
         }) // end $.get
     })// end of the paginate users table
 
+    /*
+     * Additional confirmation dialog after clicking 
+     * 'Drop the databases...'
+     */
+    $('#checkbox_drop_users_db').click(function() {
+        $this_checkbox = $(this);
+        if ($this_checkbox.is(':checked')) {
+            var is_confirmed = confirm(PMA_messages['strDropDatabaseStrongWarning'] + '\n' + PMA_messages['strDoYouReally'] + ' :\nDROP DATABASE');
+            if (! is_confirmed) {
+                $this_checkbox.attr('checked', false);
+            }
+        }
+    });
+
 }, 'top.frame_content'); //end $(document).ready()
 
 /**#@- */


hooks/post-receive
-- 
phpMyAdmin