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

Bug 6153 solved.

Browse Source 
Error was fixed. still remains implement uppercase function for IE8. at the momment there's no compatibilty.
This commit is contained in:
Enrique Ponce de Leon
2011-02-21 22:52:16 +00:00
parent 6de947d96e
commit f5d2f74bc1
2 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
workflow/engine/classes/model/AdditionalTables.php
View File

@@ -257,31 +257,32 @@ public function loadByName($name) {
$sQuery = 'CREATE TABLE IF NOT EXISTS `' . $sTableName . '` (';
$aPKs = array();
foreach ($aFields as $aField) {
$aField['sFieldName'] = strtoupper($aField['sFieldName']);
switch ($aField['sType']) {
case 'VARCHAR':
$sQuery .= '`' . strtoupper($aField['sFieldName']) . '` ' . $aField['sType'] . '(' . $aField['iSize'] . ')' . " " . ($aField['bNull'] ? 'NULL' : 'NOT NULL') . " DEFAULT '',";
$sQuery .= '`' . $aField['sFieldName'] . '` ' . $aField['sType'] . '(' . $aField['iSize'] . ')' . " " . ($aField['bNull'] ? 'NULL' : 'NOT NULL') . " DEFAULT '',";
break;
case 'TEXT':
$sQuery .= '`' . strtoupper($aField['sFieldName']) . '` ' . $aField['sType'] . " " . ($aField['bNull'] ? 'NULL' : 'NOT NULL') . " DEFAULT '',";
$sQuery .= '`' . $aField['sFieldName'] . '` ' . $aField['sType'] . " " . ($aField['bNull'] ? 'NULL' : 'NOT NULL') . " DEFAULT '',";
break;
case 'DATE':
$sQuery .= '`' . strtoupper($aField['sFieldName']) . '` ' . $aField['sType'] . " " . ($aField['bNull'] ? 'NULL' : 'NOT NULL') . " ,"; // " DEFAULT '0000-00-00',";
$sQuery .= '`' . $aField['sFieldName'] . '` ' . $aField['sType'] . " " . ($aField['bNull'] ? 'NULL' : 'NOT NULL') . " ,"; // " DEFAULT '0000-00-00',";
break;
case 'INT':
$sQuery .= '`' . strtoupper($aField['sFieldName']) . '` ' . $aField['sType'] . '(' . $aField['iSize'] . ')' . " " . ($aField['bNull'] ? 'NULL' : 'NOT NULL') . ' ' . ($aField['bAI'] ? 'AUTO_INCREMENT' : "DEFAULT '0'") . ',';
$sQuery .= '`' . $aField['sFieldName'] . '` ' . $aField['sType'] . '(' . $aField['iSize'] . ')' . " " . ($aField['bNull'] ? 'NULL' : 'NOT NULL') . ' ' . ($aField['bAI'] ? 'AUTO_INCREMENT' : "DEFAULT '0'") . ',';
if ($aField['bAI']) {
if (!in_array('`' . strtoupper($aField['sFieldName']) . '`', $aPKs)) {
$aPKs[] = '`' . strtoupper($aField['sFieldName']) . '`';
if (!in_array('`' . $aField['sFieldName'] . '`', $aPKs)) {
$aPKs[] = '`' . $aField['sFieldName'] . '`';
}
}
break;
case 'FLOAT':
$sQuery .= '`' . strtoupper($aField['sFieldName']) . '` ' . $aField['sType'] . '(' . $aField['iSize'] . ')' . " " . ($aField['bNull'] ? 'NULL' : 'NOT NULL') . " DEFAULT '0',";
$sQuery .= '`' . $aField['sFieldName'] . '` ' . $aField['sType'] . '(' . $aField['iSize'] . ')' . " " . ($aField['bNull'] ? 'NULL' : 'NOT NULL') . " DEFAULT '0',";
break;
}
if ($aField['bPrimaryKey'] == 1) {
if (!in_array('`' . strtoupper($aField['sFieldName']) . '`', $aPKs)) {
$aPKs[] = '`' . strtoupper($aField['sFieldName']) . '`';
if (!in_array('`' . $aField['sFieldName'] . '`', $aPKs)) {
$aPKs[] = '`' . $aField['sFieldName'] . '`';
}
}
}
@@ -369,6 +370,7 @@ public function loadByName($name) {
$aFieldsToDelete = array();
$aFieldsToAlter = array();
foreach ($aNewFields as $aNewField) {
$aNewField['FLD_NAME'] = strtoupper($aNewField['FLD_NAME']);
if (!isset($aOldFields[$aNewField['FLD_UID']])) {
$aFieldsToAdd[] = $aNewField;
}
@@ -379,6 +381,7 @@ public function loadByName($name) {
}
}
foreach ($aOldFields as $aOldField) {
$aOldField['FLD_NAME'] = strtoupper($aOldField['FLD_NAME']);
if (!isset($aNewFields[$aOldField['FLD_UID']])) {
$aFieldsToDelete[] = $aOldField;
}
@@ -522,7 +525,7 @@ public function loadByName($name) {
$aData['tableName'] = $sTableName;
$aData['className'] = $sClassName;
$aData['GUID'] = $sAddTabUid;
$aData['firstColumn'] = $aFields[1]['FLD_NAME'];
$aData['firstColumn'] = strtoupper($aFields[1]['FLD_NAME']);
$aData['totalColumns'] = count($aFields);
$aData['useIdGenerator'] = 'false';
$oTP1 = new TemplatePower(PATH_TPL . 'additionalTables' . PATH_SEP . 'Table.tpl');
@@ -538,6 +541,7 @@ public function loadByName($name) {
$aNotPKs = array();
$i = 0;
foreach($aFields as $iKey => $aField) {
$aField['FLD_NAME'] = strtoupper($aField['FLD_NAME']);
if ($aField['FLD_TYPE']=='DATE') $aField['FLD_NULL'] = '';
$aColumn = array('name' => $aField['FLD_NAME'],
'phpName' => $this->getPHPName($aField['FLD_NAME']),

17
workflow/engine/methods/additionalTables/additionalTablesSave.php
View File

@@ -130,6 +130,13 @@ if ($_POST['form']['ADD_TAB_UID'] == '') {
die;
}
$arrFields = $_POST['form']['FIELDS'];
$newaFields = array();
foreach ($arrFields as $arrField){
$arrField['FLD_NAME'] = strtoupper($arrField['FLD_NAME']);
$newaFields[] = $arrField;
}
$sAddTabUid = $oAdditionalTables->create(array('ADD_TAB_NAME' => $_POST['form']['ADD_TAB_NAME'],
'ADD_TAB_CLASS_NAME' => $_POST['form']['ADD_TAB_CLASS_NAME'],
'ADD_TAB_DESCRIPTION' => $_POST['form']['ADD_TAB_DESCRIPTION'],
@@ -140,7 +147,7 @@ if ($_POST['form']['ADD_TAB_UID'] == '') {
'ADD_TAB_SDW_MAX_LENGTH' => $_POST['form']['ADD_TAB_SDW_MAX_LENGTH'],
'ADD_TAB_SDW_AUTO_DELETE' => ($_POST['form']['ADD_TAB_SDW_AUTO_DELETE'] == 'on' ? 1 : 0),
'ADD_TAB_DYNAVARS' => $aDynavars,
'ADD_TAB_PLG_UID' => ''), $_POST['form']['FIELDS']);
'ADD_TAB_PLG_UID' => ''), $newaFields);
$aFields = array();
/*$aFields[] = array('sType' => 'INT',
'iSize' => '11',
@@ -151,7 +158,7 @@ if ($_POST['form']['ADD_TAB_UID'] == '') {
foreach ($_POST['form']['FIELDS'] as $iRow => $aRow) {
$oFields->create(array('FLD_INDEX' => $iRow,
'ADD_TAB_UID' => $sAddTabUid,
'FLD_NAME' => $_POST['form']['FIELDS'][$iRow]['FLD_NAME'],
'FLD_NAME' => strtoupper($_POST['form']['FIELDS'][$iRow]['FLD_NAME']),
'FLD_DESCRIPTION' => $_POST['form']['FIELDS'][$iRow]['FLD_DESCRIPTION'],
'FLD_TYPE' => $_POST['form']['FIELDS'][$iRow]['FLD_TYPE'],
'FLD_SIZE' => $_POST['form']['FIELDS'][$iRow]['FLD_SIZE'],
@@ -162,13 +169,13 @@ if ($_POST['form']['ADD_TAB_UID'] == '') {
'FLD_FOREIGN_KEY_TABLE' => $_POST['form']['FIELDS'][$iRow]['FLD_FOREIGN_KEY_TABLE']));
$aFields[] = array('sType' => $_POST['form']['FIELDS'][$iRow]['FLD_TYPE'],
'iSize' => $_POST['form']['FIELDS'][$iRow]['FLD_SIZE'],
'sFieldName' => $_POST['form']['FIELDS'][$iRow]['FLD_NAME'],
'sFieldName' => strtoupper($_POST['form']['FIELDS'][$iRow]['FLD_NAME']),
'bNull' => ($_POST['form']['FIELDS'][$iRow]['FLD_NULL'] == 'on' ? 1 : 0),
'bAI' => ($_POST['form']['FIELDS'][$iRow]['FLD_AUTO_INCREMENT'] == 'on' ? 1 : 0),
'bPrimaryKey' => ($_POST['form']['FIELDS'][$iRow]['FLD_KEY'] == 'on' ? 1 : 0));
}
$oAdditionalTables->createTable($_POST['form']['ADD_TAB_NAME'], 'wf', $aFields);
$oAdditionalTables->createPropelClasses($_POST['form']['ADD_TAB_NAME'], $_POST['form']['ADD_TAB_CLASS_NAME'], $_POST['form']['FIELDS'], $sAddTabUid);
$oAdditionalTables->createPropelClasses($_POST['form']['ADD_TAB_NAME'], $_POST['form']['ADD_TAB_CLASS_NAME'], $newaFields, $sAddTabUid);
}
else {
$aData = $oAdditionalTables->load($_POST['form']['ADD_TAB_UID'], true);
@@ -192,7 +199,7 @@ else {
$sUID = $oFields->create(array('FLD_UID' => $_POST['form']['FIELDS'][$iRow]['FLD_UID'],
'ADD_TAB_UID' => $_POST['form']['ADD_TAB_UID'],
'FLD_INDEX' => $iRow,
'FLD_NAME' => $_POST['form']['FIELDS'][$iRow]['FLD_NAME'],
'FLD_NAME' => strtoupper($_POST['form']['FIELDS'][$iRow]['FLD_NAME']),
'FLD_DESCRIPTION' => $_POST['form']['FIELDS'][$iRow]['FLD_DESCRIPTION'],
'FLD_TYPE' => $_POST['form']['FIELDS'][$iRow]['FLD_TYPE'],
'FLD_SIZE' => $_POST['form']['FIELDS'][$iRow]['FLD_SIZE'],