fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1047 from julceslauhub/master

Browse Source 
BUG 7900 DynaForm title not changed in designer, on save SOLVED
This commit is contained in:
julceslauhub
2012-12-04 08:12:08 -08:00
parent 0704babff8 5aa3050203
commit 57cac993b6
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/class.toolBar.php
View File

@@ -163,7 +163,7 @@ class XmlForm_Field_toolButton extends XmlForm_Field
$dataset = DynaformPeer::doSelectRS($criteria); $dataset = DynaformPeer::doSelectRS($criteria);
if ($dataset->getRecordCount() > 0) { if ($dataset->getRecordCount() > 0) {
$html .= '<span style="font-size: 8pt;margin-left: 20px;">' . G::LoadTranslation('ID_EDITING_DYNAFORM'); $html .= '<span style="font-size: 8pt;margin-left: 20px;">' . G::LoadTranslation('ID_EDITING_DYNAFORM');
$html .= ': <select onchange="window.location = \'dynaforms_Editor?PRO_UID=' . $this->owner->values['PRO_UID']; $html .= ': <select id="_dynaformsList_" onchange="window.location = \'dynaforms_Editor?PRO_UID=' . $this->owner->values['PRO_UID'];
$html .= '&DYN_UID=\' + this.value;" class="module_app_input___gray">'; $html .= '&DYN_UID=\' + this.value;" class="module_app_input___gray">';
$dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC); $dataset->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$dataset->next(); $dataset->next();

7
workflow/engine/js/dynaformEditor/core/dynaformEditor.js
View File

@@ -243,6 +243,7 @@ var dynaformEditor={
return false; return false;
} }
if (res==0) { if (res==0) {
document.getElementById('_dynaformsList_').options[document.getElementById('_dynaformsList_').selectedIndex].text = getField('DYN_TITLE', 'dynaforms_Properties').value;
alert(G_STRINGS.ID_SAVED); alert(G_STRINGS.ID_SAVED);
} else { } else {
if (typeof(res.innerHTML) == 'undefined') { if (typeof(res.innerHTML) == 'undefined') {
@@ -291,14 +292,14 @@ var dynaformEditor={
document.getElementById('importAjax').style.display = 'none'; document.getElementById('importAjax').style.display = 'none';
panelImportDyna.addContent(oRPC.xmlhttp.responseText); panelImportDyna.addContent(oRPC.xmlhttp.responseText);
}, },
import:function(uidDynaSelect){ importation:function(uidDynaSelect){
document.getElementById('importAjax').style.display = 'block'; document.getElementById('importAjax').style.display = 'block';
document.getElementById('importForm').style.display = 'none'; document.getElementById('importForm').style.display = 'none';
var oRPC = new leimnud.module.rpc.xmlhttp({ var oRPC = new leimnud.module.rpc.xmlhttp({
url : '../dynaforms/fieldsHandlerAjax', url : '../dynaforms/fieldsHandlerAjax',
async : false, async : false,
method: 'POST', method: 'POST',
args : 'request=import' + '&DYN_UID=' + this.dynUid + '&FILE=' + uidDynaSelect args : 'request=importation' + '&DYN_UID=' + this.dynUid + '&FILE=' + uidDynaSelect
}); });
oRPC.make(); oRPC.make();
resp = oRPC.xmlhttp.responseText; resp = oRPC.xmlhttp.responseText;
@@ -605,7 +606,7 @@ var dynaformEditor={
delete myScripts; delete myScripts;
}, },
refresh_htmlcode:function() refresh_htmlcode:function()
{ {
var dynaformEditorHTML = this.views["htmlcode"]; var dynaformEditorHTML = this.views["htmlcode"];
if (this.htmlEditorLoaded) if (this.htmlEditorLoaded)
{ {

6
workflow/engine/methods/dynaforms/fieldsHandlerAjax.php
View File

@@ -123,7 +123,7 @@ switch ($request) {
$oCriteria->add( 'C_PROC.CON_CATEGORY', 'PRO_TITLE' ); $oCriteria->add( 'C_PROC.CON_CATEGORY', 'PRO_TITLE' );
$oCriteria->add( DynaformPeer::DYN_UID, $uidDynafom, Criteria::NOT_EQUAL); $oCriteria->add( DynaformPeer::DYN_UID, $uidDynafom, Criteria::NOT_EQUAL);
$oCriteria->addAscendingOrderByColumn ('PROC_NAME'); $oCriteria->addAscendingOrderByColumn ('PROC_NAME');
$oCriteria->addAscendingOrderByColumn ('DYNA_NAME'); $oCriteria->addAscendingOrderByColumn ('DYNA_NAME');
$oDataset = DynaformPeer::doSelectRS( $oCriteria ); $oDataset = DynaformPeer::doSelectRS( $oCriteria );
@@ -166,7 +166,7 @@ switch ($request) {
</tr> </tr>
<tr> <tr>
<td align="center" colspan="2" class="FormButton"> <td align="center" colspan="2" class="FormButton">
<input type="button" onclick="dynaformEditor.import(document.getElementById(&#39;form[IMPORT_DYNA]&#39;).value);" value="' . G::LoadTranslation('ID_IMPORT') . '" class="module_app_button___gray " style=""> &nbsp; <input type="button" onclick="dynaformEditor.importation(document.getElementById(&#39;form[IMPORT_DYNA]&#39;).value);" value="' . G::LoadTranslation('ID_IMPORT') . '" class="module_app_button___gray " style=""> &nbsp;
<input type="button" onclick="panelImportDyna.remove();" value="' . G::LoadTranslation('ID_CANCEL') . '" class="module_app_button___gray " style=""> <input type="button" onclick="panelImportDyna.remove();" value="' . G::LoadTranslation('ID_CANCEL') . '" class="module_app_button___gray " style="">
</td> </td>
</tr> </tr>
@@ -174,7 +174,7 @@ switch ($request) {
</table><div>'; </table><div>';
echo $html; echo $html;
break; break;
case 'import': case 'importation':
require_once 'classes/model/Dynaform.php'; require_once 'classes/model/Dynaform.php';
$uidDynafom = $_POST['DYN_UID']; $uidDynafom = $_POST['DYN_UID'];
$oCriteria = new Criteria( 'workflow' ); $oCriteria = new Criteria( 'workflow' );