Merge remote branch 'upstream/master' into BUG-9319
This commit is contained in:
@@ -6,10 +6,10 @@ $aData = $oAdditionalTables->load($_POST['ADD_TABLE'], true);
|
||||
$addTabName = $aData['ADD_TAB_NAME'];
|
||||
$c = 1;
|
||||
foreach ($aData['FIELDS'] as $iRow => $aRow) {
|
||||
if ($aRow['FLD_KEY'] == 1) {
|
||||
$aRow['PRO_VARIABLE'] = '';
|
||||
$aFields['FIELDS'][$c++] = $aRow;
|
||||
}
|
||||
if ($aRow['FLD_KEY'] == 1) {
|
||||
$aRow['PRO_VARIABLE'] = '';
|
||||
$aFields['FIELDS'][$c++] = $aRow;
|
||||
}
|
||||
}
|
||||
$aFields['DYN_UID'] = $_POST['DYN_UID'];
|
||||
$aFields['ADD_TABLE'] = $_POST['ADD_TABLE'];
|
||||
@@ -19,11 +19,11 @@ $aFields['DYN_TYPE'] = $_POST['DYN_TYPE'];
|
||||
$aFields['DYN_DESCRIPTION'] = $_POST['DYN_DESCRIPTION'];
|
||||
$aFields['VALIDATION_MESSAGE'] = G::LoadTranslation('ID_FILL_PRIMARY_KEYS');
|
||||
|
||||
|
||||
G::LoadClass('xmlfield_InputPM');
|
||||
|
||||
$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');
|
||||
?>
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<en>Login</en>
|
||||
</TITLE>
|
||||
|
||||
<USR_USERNAME type="text" size="30" maxlength="50" validate="Login" >
|
||||
<USR_USERNAME type="text" size="30" maxlength="50" validate="Any" >
|
||||
<en>User</en>
|
||||
</USR_USERNAME>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user