lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: conflict with anothers dialog box

Browse Source
This commit is contained in:
Regis Houssin 2012-06-08 16:25:17 +02:00
parent 1fc102825a
commit d9e3a941de
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/class/html.form.class.php
View File

@ -2249,12 +2249,6 @@ class Form
$formconfirm.= img_help('','').' '.$question; $formconfirm.= img_help('','').' '.$question;
$formconfirm.= '</div>'."\n"; $formconfirm.= '</div>'."\n";
$formconfirm.= '<script type="text/javascript"> $formconfirm.= '<script type="text/javascript">
var choice=\'ko\';
var inputok='.json_encode($inputok).';
var inputko='.json_encode($inputko).';
var pageyes=\''.dol_escape_js($pageyes?$pageyes:'').'\';
var pageno=\''.dol_escape_js($pageno?$pageno:'').'\';
/* Warning: This function is loaded once and not overwritten if loaded by another ajax page */ /* Warning: This function is loaded once and not overwritten if loaded by another ajax page */
$(function() { $(function() {
$( "#'.$dialogconfirm.'" ).dialog({ $( "#'.$dialogconfirm.'" ).dialog({
@ -2267,6 +2261,8 @@ class Form
close: function(event, ui) { close: function(event, ui) {
if (choice == \'ok\') { if (choice == \'ok\') {
var options=""; var options="";
var inputok='.json_encode($inputok).';
var pageyes=\''.dol_escape_js($pageyes?$pageyes:'').'\';
if (inputok.length>0) { if (inputok.length>0) {
$.each(inputok, function() { $.each(inputok, function() {
var inputname = this; var more = \'\'; var inputname = this; var more = \'\';
@ -2282,6 +2278,8 @@ class Form
} }
if (choice == \'ko\') { if (choice == \'ko\') {
var options=""; var options="";
var inputko='.json_encode($inputko).';
var pageno=\''.dol_escape_js($pageno?$pageno:'').'\';
if (inputko.length>0) { if (inputko.length>0) {
$.each(inputko, function() { $.each(inputko, function() {
var inputname = this; var more = \'\'; var inputname = this; var more = \'\';