diff --git a/gulliver/js/form/core/form.js b/gulliver/js/form/core/form.js index f1849e3ed..cd16f2f7a 100755 --- a/gulliver/js/form/core/form.js +++ b/gulliver/js/form/core/form.js @@ -3900,40 +3900,6 @@ function dropDownSetOption(elem, arrayOption) } } -function dynaFormPrint(arrayForm, link, width, height, left, top, resizable) -{ - var frm = arrayForm[0]; - - if (dynaFormChanged(frm)) { - swSubmitValidateForm = 1; - - new leimnud.module.app.confirm().make({ - label: _("ID_SAVE_DYNAFORM_INFORMATION_BEFORE_PRINTING"), - - action: function () - { - if (frm.length > 0) { - var result = ajax_post( - frm.action, - frm, - "POST", - function (responseText) - { - popUp(link, width, height, left, top, resizable); - }, - true - ); - } - }, - - cancel: function() - { - popUp(link, width, height, left, top, resizable); - } - }); - } -} - function dynaFormChanged(frm) { for (var i1 = 0; i1 <= frm.elements.length - 1; i1++) { @@ -3963,3 +3929,39 @@ function dynaFormChanged(frm) return false; } + +function dynaFormPrint(formId, link, width, height, left, top, resizable) +{ + var frm = document.getElementById(formId); + + if (dynaFormChanged(frm)) { + swSubmitValidateForm = 1; + + new leimnud.module.app.confirm().make({ + label: _("ID_SAVE_DYNAFORM_INFORMATION_BEFORE_PRINTING"), + + action: function () + { + if (frm.length > 0) { + var result = ajax_post( + frm.action, + frm, + "POST", + function (responseText) + { + popUp(link, width, height, left, top, resizable); + }, + true + ); + } + }, + + cancel: function() + { + popUp(link, width, height, left, top, resizable); + } + }); + } else { + popUp(link, width, height, left, top, resizable); + } +} diff --git a/gulliver/js/maborak/core/maborak.js b/gulliver/js/maborak/core/maborak.js index 8110c2b40..e349ac687 100644 --- a/gulliver/js/maborak/core/maborak.js +++ b/gulliver/js/maborak/core/maborak.js @@ -1279,17 +1279,17 @@ function dropDownSetOption(elem,arrayOption) selectdd.innerHTML="";for(i=0;i<=arrayOption.options.length-1;i++){if(swOptGroup==1&&/^optgroup\d+$/.test(arrayOption.options[i].key)){optGroupAux=document.createElement("optgroup");optGroupAux.label=arrayOption.options[i].value;swOptGroupPrev=1;swAppend=1;}else{if(swOptGroupPrev==1){if(swAppend==1){selectdd.appendChild(optGroupAux);swAppend=0;} optionAux=document.createElement("option");optGroupAux.appendChild(optionAux);optionAux.value=arrayOption.options[i].key;optionAux.text=arrayOption.options[i].value;}else{optionAux=document.createElement("option");selectdd.appendChild(optionAux);optionAux.value=arrayOption.options[i].key;optionAux.text=arrayOption.options[i].value;}}} if(selectdd.options.length==0){selectdd.options[0]=new Option("","");}} -function dynaFormPrint(arrayForm,link,width,height,left,top,resizable) -{var frm=arrayForm[0];if(dynaFormChanged(frm)){swSubmitValidateForm=1;new leimnud.module.app.confirm().make({label:_("ID_SAVE_DYNAFORM_INFORMATION_BEFORE_PRINTING"),action:function() -{if(frm.length>0){var result=ajax_post(frm.action,frm,"POST",function(responseText) -{popUp(link,width,height,left,top,resizable);},true);}},cancel:function() -{popUp(link,width,height,left,top,resizable);}});}} function dynaFormChanged(frm) {for(var i1=0;i1<=frm.elements.length-1;i1++){if(frm.elements[i1].type=="text"&&frm.elements[i1].value!=frm.elements[i1].defaultValue){return true;} if(frm.elements[i1].type=="textarea"&&frm.elements[i1].value!=frm.elements[i1].defaultValue){return true;} if(frm.elements[i1].tagName.toLowerCase()=="select"){var selectDefaultValue=frm.elements[i1].value;for(var i2=0;i2<=frm.elements[i1].options.length-1;i2++){if(frm.elements[i1].options[i2].defaultSelected){selectDefaultValue=frm.elements[i1].options[i2].value;break;}} if(frm.elements[i1].value!=selectDefaultValue){return true;}}} return false;} +function dynaFormPrint(formId,link,width,height,left,top,resizable) +{var frm=document.getElementById(formId);if(dynaFormChanged(frm)){swSubmitValidateForm=1;new leimnud.module.app.confirm().make({label:_("ID_SAVE_DYNAFORM_INFORMATION_BEFORE_PRINTING"),action:function() +{if(frm.length>0){var result=ajax_post(frm.action,frm,"POST",function(responseText) +{popUp(link,width,height,left,top,resizable);},true);}},cancel:function() +{popUp(link,width,height,left,top,resizable);}});}else{popUp(link,width,height,left,top,resizable);}} function G_PagedTable() {this.id='';this.name='';this.event='';this.element=null;this.field='';this.ajaxUri='';this.currentOrder='';this.currentFilter='';this.currentPage=1;this.totalRows=0;this.rowsPerPage=25;this.onInsertField='';this.onDeleteField='';this.afterDeleteField='';this.onUpdateField='';this.form;var me=this;function loadTable(func,uri){var div=document.getElementById('table['+me.id+']');var newContent=ajax_function(me.ajaxUri,func,uri);if(div.outerHTML){div.outerHTML=div.outerHTML.split(div.innerHTML).join(newContent);}else{div.innerHTML=newContent;} var myScripts=div.getElementsByTagName('SCRIPT');for(var rr=0;rrvalue, $owner->values ); $label = G::replaceDataField( $this->label, $owner->values ); - $html = ' + $html = ' ';