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

Merge remote branch 'upstream/master' into BUG-9319

Browse Source
This commit is contained in:
Victor Saisa Lopez
2012-07-02 16:37:10 -04:00
parent b7fa89397a 568a16f651
commit b51b759245
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
workflow/engine/methods/dynaforms/dynaforms_AssignVariables.php
View File

@@ -6,10 +6,10 @@ $aData = $oAdditionalTables->load($_POST['ADD_TABLE'], true);
$addTabName = $aData['ADD_TAB_NAME']; $addTabName = $aData['ADD_TAB_NAME'];
$c = 1; $c = 1;
foreach ($aData['FIELDS'] as $iRow => $aRow) { foreach ($aData['FIELDS'] as $iRow => $aRow) {
if ($aRow['FLD_KEY'] == 1) { if ($aRow['FLD_KEY'] == 1) {
$aRow['PRO_VARIABLE'] = ''; $aRow['PRO_VARIABLE'] = '';
$aFields['FIELDS'][$c++] = $aRow; $aFields['FIELDS'][$c++] = $aRow;
} }
} }
$aFields['DYN_UID'] = $_POST['DYN_UID']; $aFields['DYN_UID'] = $_POST['DYN_UID'];
$aFields['ADD_TABLE'] = $_POST['ADD_TABLE']; $aFields['ADD_TABLE'] = $_POST['ADD_TABLE'];
@@ -19,11 +19,11 @@ $aFields['DYN_TYPE'] = $_POST['DYN_TYPE'];
$aFields['DYN_DESCRIPTION'] = $_POST['DYN_DESCRIPTION']; $aFields['DYN_DESCRIPTION'] = $_POST['DYN_DESCRIPTION'];
$aFields['VALIDATION_MESSAGE'] = G::LoadTranslation('ID_FILL_PRIMARY_KEYS'); $aFields['VALIDATION_MESSAGE'] = G::LoadTranslation('ID_FILL_PRIMARY_KEYS');
G::LoadClass('xmlfield_InputPM'); G::LoadClass('xmlfield_InputPM');
$G_PUBLISH = new Publisher(); $G_PUBLISH = new Publisher();
$G_PUBLISH->AddContent('xmlform', 'xmlform', 'dynaforms/dynaforms_AssignVariables', '', $aFields, SYS_URI . 'dynaforms/dynaforms_Save'); $G_PUBLISH->AddContent('xmlform', 'xmlform', 'dynaforms/dynaforms_AssignVariables', '', $aFields,
SYS_URI . 'dynaforms/dynaforms_Save');
G::RenderPage('publish-raw', 'raw'); G::RenderPage('publish-raw', 'raw');
?>

2
workflow/engine/xmlform/login/sysLoginNoWS.xml
View File

@@ -4,7 +4,7 @@
<en>Login</en> <en>Login</en>
</TITLE> </TITLE>
<USR_USERNAME type="text" size="30" maxlength="50" validate="Login" > <USR_USERNAME type="text" size="30" maxlength="50" validate="Any" >
<en>User</en> <en>User</en>
</USR_USERNAME> </USR_USERNAME>