CoreLibs/development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch all array init calles to no space before bracket

Browse Source 
Also bug fix in Form General for load int PK calls with non int types
This commit is contained in:
Clemens Schwaighofer
2019-09-20 11:10:13 +09:00
parent 8ade113070
commit ef1df6f171
26 changed files with 398 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
www/lib/CoreLibs/Output/Form/Generate.php
View File

@@ -437,10 +437,10 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
// next for functions are pre_test fkts for easier default new,load, etc handling // next for functions are pre_test fkts for easier default new,load, etc handling
/** /**
* default load procedure * default load procedure
* @param int $archive_id archive id to load * @param string $archive_id archive id to load
* @return void has no return * @return void has no return
*/ */
public function formProcedureLoad(int $archive_id): void public function formProcedureLoad(string $archive_id): void
{ {
if ($this->archive && $archive_id && $this->base_acl_level >= $this->security_level['load']) { if ($this->archive && $archive_id && $this->base_acl_level >= $this->security_level['load']) {
$this->formLoadTableArray($archive_id); $this->formLoadTableArray($archive_id);
@@ -742,8 +742,9 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
$data['value'][] = $i; $data['value'][] = $i;
$data['output'][] = $this->table_array[$element_name]['element_list'][$i]; $data['output'][] = $this->table_array[$element_name]['element_list'][$i];
$data['name'] = $element_name; $data['name'] = $element_name;
if (($i && isset($this->table_array[$element_name]['value'])) || if (isset($this->table_array[$element_name]['value']) &&
(!$i && !isset($this->table_array[$element_name]['value'])) (($i && $this->table_array[$element_name]['value']) ||
(!$i && !$this->table_array[$element_name]['value']))
) { ) {
$data['checked'] = $this->table_array[$element_name]['value']; $data['checked'] = $this->table_array[$element_name]['value'];
} }
@@ -1248,10 +1249,10 @@ class Generate extends \CoreLibs\DB\Extended\ArrayIO
/** /**
* load a table & reference * load a table & reference
* @param int|null $pk_id overrule pk_id * @param string|null $pk_id overrule pk_id
* @return void has no return * @return void has no return
*/ */
public function formLoadTableArray(?int $pk_id = null): void public function formLoadTableArray(?string $pk_id = null): void
{ {
if ($pk_id) { if ($pk_id) {
$this->pk_id = $pk_id; $this->pk_id = $pk_id;