Skip to content

Commit f07b541

Browse files
mambax7mambax7
authored
Merge pull request #15 from ggoffy/master
update test data
2 parents 35937da + 76a8b65 commit f07b541

File tree

10 files changed

+147
-382
lines changed

10 files changed

+147
-382
lines changed

‎_TODO.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ TODOs:
1111

1212
new xoops_confirm
1313

14+
catch error when notification selected but no status field exists
1415

1516
Broken files:
1617
Notification for broken files in xoops_version adapt?

‎class/Files/Classes/ClassFiles.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ private function getValuesInObject($moduleDirname, $table, $fields)
448448
$fieldElementTid = $fieldElements->getVar('fieldelement_tid');
449449
if ((int)$fieldElementTid > 0 ) {
450450
$fieldElementMid = $fieldElements->getVar('fieldelement_mid');
451-
$fieldElementName = $fieldElements->getVar('fieldelement_name');
451+
$fieldElementName = (string)$fieldElements->getVar('fieldelement_name');
452452
$fieldNameDesc = mb_substr($fieldElementName, mb_strrpos($fieldElementName, ':'), mb_strlen($fieldElementName));
453453
$topicTableName = str_replace(': ', '', mb_strtolower($fieldNameDesc));
454454
$fieldsTopics = $this->getTableFields($fieldElementMid, $fieldElementTid);

‎class/Files/User/UserPages.php‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,9 @@ public function getUserPagesSave($moduleDirname, $fields, $tableName, $tableSole
181181
$ccFieldId = '';
182182
$fieldMain = '';
183183
$fieldStatus = '';
184+
$ucfFieldId = '';
185+
$ccFieldMain = '';
186+
$ccFieldStatus = '';
184187
foreach (array_keys($fields) as $f) {
185188
$fieldName = $fields[$f]->getVar('field_name');
186189
if (0 == $f) {
@@ -193,13 +196,11 @@ public function getUserPagesSave($moduleDirname, $fields, $tableName, $tableSole
193196
}
194197
if (1 == $fields[$f]->getVar('field_main')) {
195198
$fieldMain = $fieldName; // fieldMain = fields parameters main field
196-
$stuFieldMain = mb_strtoupper($fieldMain);
197199
$ccFieldMain = $this->getCamelCase($fieldMain, false, true);
198200
}
199201
if ($fields[$f]->getVar('field_element') == 16) {
200202
$fieldStatus = $fieldName;
201203
$ccFieldStatus = $this->getCamelCase($fieldStatus, false, true);
202-
203204
}
204205
}
205206

@@ -391,7 +392,7 @@ private function getUserPagesDelete($tableName, $tableSoleName, $language, $fiel
391392
* @param string $t
392393
* @return string
393394
*/
394-
private function getUserPagesBroken($language, $moduleDirname, $tableName, $tableSoleName, $fieldId, $fieldSatus, $fieldMain, $tableNotifications, $t = '')
395+
private function getUserPagesBroken($language, $moduleDirname, $tableName, $tableSoleName, $fieldId, $fieldStatus, $fieldMain, $tableNotifications, $t = '')
395396
{
396397
$pc = Modulebuilder\Files\CreatePhpCode::getInstance();
397398
$xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
@@ -406,7 +407,7 @@ private function getUserPagesBroken($language, $moduleDirname, $tableName, $tabl
406407
$ret .= $pc->getPhpCodeConditions("\${$ccFieldId}", ' == ', '0', $contIf, false, $t);
407408
$ret .= $xc->getXcHandlerGet($tableName, $ccFieldId, 'Obj', $tableName . 'Handler', false, $t);
408409
$constant = $xc->getXcGetConstants('STATUS_BROKEN');
409-
$ret .= $xc->getXcSetVarObj($tableName, $fieldSatus, $constant, $t);
410+
$ret .= $xc->getXcSetVarObj($tableName, $fieldStatus, $constant, $t);
410411
$ret .= $xc->getXcGetVar($ccFieldMain, "{$tableName}Obj", $fieldMain, false, $t);
411412
$ret .= $pc->getPhpCodeCommentLine('Insert Data', null, $t);
412413
$insert = $xc->getXcHandlerInsert($tableName, $tableName, 'Obj');
@@ -479,7 +480,7 @@ private function getUserPagesFooter($moduleDirname, $tableName, $language)
479480
* @param $t
480481
* @return string
481482
*/
482-
private function getUserPagesSwitch($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableSubmit, $tablePermissions, $tableBroken, $fieldId, $fieldMain, $fieldSatus, $tableNotifications, $language, $t)
483+
private function getUserPagesSwitch($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableSubmit, $tablePermissions, $tableBroken, $fieldId, $fieldMain, $fieldStatus, $tableNotifications, $language, $t)
483484
{
484485
$xc = Modulebuilder\Files\CreateXoopsCode::getInstance();
485486

@@ -493,7 +494,7 @@ private function getUserPagesSwitch($moduleDirname, $tableId, $tableMid, $tableN
493494
$cases['delete'] = [$this->getUserPagesDelete($tableName, $tableSoleName, $language, $fieldId, $fieldMain, $tableNotifications,$t . "\t")];
494495
}
495496
if (1 == $tableBroken) {
496-
$cases['broken'] = [$this->getUserPagesBroken($language, $moduleDirname, $tableName, $tableSoleName, $fieldId, $fieldSatus, $fieldMain, $tableNotifications, $t . "\t")];
497+
$cases['broken'] = [$this->getUserPagesBroken($language, $moduleDirname, $tableName, $tableSoleName, $fieldId, $fieldStatus, $fieldMain, $tableNotifications, $t . "\t")];
497498
}
498499

499500
return $xc->getXcSwitch('op', $cases, true, false);
@@ -522,7 +523,7 @@ public function render()
522523
// Fields
523524
$fieldId = '';
524525
$fieldMain = '';
525-
$fieldSatus = '';
526+
$fieldStatus = '';
526527
$fields = $this->getTableFields($table->getVar('table_mid'), $table->getVar('table_id'));
527528
foreach (array_keys($fields) as $f) {
528529
$fieldName = $fields[$f]->getVar('field_name');
@@ -533,12 +534,12 @@ public function render()
533534
$fieldMain = $fieldName; // fieldMain = fields parameters main field
534535
}
535536
if (16 == $fields[$f]->getVar('field_element')) {
536-
$fieldSatus = $fieldName; // fieldMain = fields parameters main field
537+
$fieldStatus = $fieldName; // fieldMain = fields parameters main field
537538
}
538539
}
539540
$content = $this->getHeaderFilesComments($module);
540541
$content .= $this->getUserPagesHeader($moduleDirname, $tableName, $fieldId);
541-
$content .= $this->getUserPagesSwitch($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableSubmit, $tablePermissions, $tableBroken, $fieldId, $fieldMain, $fieldSatus, $tableNotifications, $language, "\t");
542+
$content .= $this->getUserPagesSwitch($moduleDirname, $tableId, $tableMid, $tableName, $tableSoleName, $tableSubmit, $tablePermissions, $tableBroken, $fieldId, $fieldMain, $fieldStatus, $tableNotifications, $language, "\t");
542543
$content .= $this->getUserPagesFooter($moduleDirname, $tableName, $language);
543544

544545
$this->create($moduleDirname, '/', $filename, $content, _AM_MODULEBUILDER_FILE_CREATED, _AM_MODULEBUILDER_FILE_NOTCREATED);

‎testdata/english/modulebuilder_fieldelements.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -199,27 +199,27 @@
199199
-
200200
fieldelement_id: '23'
201201
fieldelement_mid: '1'
202-
fieldelement_tid: '1'
203-
fieldelement_name: 'Table : Topics'
204-
fieldelement_value: XoopsFormTables-Topics
202+
fieldelement_tid: '3'
203+
fieldelement_name: 'Table : Testfields'
204+
fieldelement_value: XoopsFormTables-Testfields
205205
fieldelement_sort: '0'
206-
fieldelement_deftype: '0'
207-
fieldelement_defvalue: '0'
206+
fieldelement_deftype: '2'
207+
fieldelement_defvalue: '10'
208208
-
209209
fieldelement_id: '24'
210210
fieldelement_mid: '1'
211-
fieldelement_tid: '2'
212-
fieldelement_name: 'Table : Articles'
213-
fieldelement_value: XoopsFormTables-Articles
211+
fieldelement_tid: '1'
212+
fieldelement_name: 'Table : Categories'
213+
fieldelement_value: XoopsFormTables-Categories
214214
fieldelement_sort: '0'
215-
fieldelement_deftype: '0'
216-
fieldelement_defvalue: '0'
215+
fieldelement_deftype: '2'
216+
fieldelement_defvalue: '10'
217217
-
218218
fieldelement_id: '25'
219219
fieldelement_mid: '1'
220-
fieldelement_tid: '3'
221-
fieldelement_name: 'Table : Zzz'
222-
fieldelement_value: XoopsFormTables-Zzz
220+
fieldelement_tid: '2'
221+
fieldelement_name: 'Table : Articles'
222+
fieldelement_value: XoopsFormTables-Articles
223223
fieldelement_sort: '0'
224-
fieldelement_deftype: '0'
225-
fieldelement_defvalue: '0'
224+
fieldelement_deftype: '2'
225+
fieldelement_defvalue: '10'

0 commit comments

Comments
 (0)