diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-06-19 19:56:52 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-06-19 19:56:52 +0000 |
| commit | f11bba5537b10423e2d7c3c0bf91d744396e227c (patch) | |
| tree | 91529ab1d2536e9e1efa968bc049e1475822e187 | |
| parent | c2fca3799927112e6e4e4e1ff3a95995fd579cf7 (diff) | |
| download | redmine-f11bba5537b10423e2d7c3c0bf91d744396e227c.tar.gz redmine-f11bba5537b10423e2d7c3c0bf91d744396e227c.zip | |
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
| -rw-r--r-- | app/views/sudo_mode/new.js.erb | 6 | ||||
| -rw-r--r-- | public/javascripts/application.js | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app/views/sudo_mode/new.js.erb b/app/views/sudo_mode/new.js.erb index 34510fa54..ed77b32b1 100644 --- 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 0a12bc026..775ad592f 100644 --- 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) { |