Fixed the sudo dialog when called from a dialog, eg. email addresses (#19851).

git-svn-id: http://svn.redmine.org/redmine/trunk@14339 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/sudo_mode/new.js.erb b/app/views/sudo_mode/new.js.erb
index 34510fa540e777dcbf8f3a95fe71dbed6e224387..ed77b32b13c7159b6fdab72992e2f07a8a83c3d8 100644 (file)
--- a/app/views/sudo_mode/new.js.erb
+++ b/app/views/sudo_mode/new.js.erb
@@ -1,4 +1,4 @@
-$('#ajax-modal').html('<%= escape_javascript render partial: 'sudo_mode/new_modal' %>');
-showModal('ajax-modal', '400px');
+$("body").append($("<div>", {id: "sudo-modal"}).hide());
+$('#sudo-modal').html('<%= escape_javascript render partial: 'sudo_mode/new_modal' %>');
+showModal('sudo-modal', '400px');
 $('#sudo_password').focus();
-

diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 0a12bc0265fada7df21a7aa3b7c7652c7427f267..775ad592f7a686fc2018e9d285251601753001e5 100644 (file)
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -383,6 +383,8 @@ function showModal(id, width, title) {
   var el = $('#'+id).first();
   if (el.length === 0 || el.is(':visible')) {return;}
   if (!title) title = el.find('h3.title').text();
+  // moves existing modals behind the transparent background
+  $(".modal").zIndex(99);
   el.dialog({
     width: width,
     modal: true,
@@ -401,6 +403,8 @@ function hideModal(el) {
     modal = $('#ajax-modal');
   }
   modal.dialog("close");
+  // restores existing modals in front of the transparent background
+  $(".modal").zIndex(101);
 }
 
 function submitPreview(url, form, target) {