Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Update method so that its implementation is not identical to printxxxBlock and extract some nested ternary operation into an independent statement.

Browse Source
This commit is contained in:
liuruogu
2023-05-09 19:36:24 +08:00
parent e805e3d8c8
commit 2d5eb46e86
2 changed files with 46 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/control.php
+9 -8
View File
@@ -56,7 +56,7 @@ class block extends control
$this->view->code = $code;
$this->view->modules = $this->blockZen->getAvailableModules($dashboard);
$this->view->codes = $this->blockZen->getAvailableCodes($dashboard, $module);
$this->view->params = $this->blockZen->getAvailableParams($dashboard, $module, $code);
$this->view->params = $this->blockZen->getAvailableParams($module, $code);
$this->display();
}
@@ -84,21 +84,22 @@ class block extends control
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => true, 'closeModal' => true));
}
/* 如果没传code说明是首次进入页面，直接使用待编辑block的code。*/
/* If no code is passed, it indicates that you are entering the page for the first time, and you can directly use the code of the block to be edited.*/
/* 如果没传 $code 说明是首次进入页面，直接使用待编辑 $block 的 $code。 */
/* If no $code is passed, it indicates that you are entering the page for the first time, and you can directly use the $code of the $block to be edited. */
$block = $this->block->getByID($blockID);
$code = $code ? $code : $block->code;
$codes = $this->blockZen->getAvailableCodes($block->dashboard, $this->view->module);
$this->view->title = $this->lang->block->editBlock;
$this->view->block = $block;
$this->view->dashboard = $block->dashboard;
$this->view->module = $module ? $module : $block->module;
$this->view->modules = $this->blockZen->getAvailableModules($block->dashboard);
$this->view->codes = $this->blockZen->getAvailableCodes($block->dashboard, $this->view->module);
/* codes有值且包含code时，页面才选中对应的code，否则为空。*/
/* Only when codes have a value and contain codes, the corresponding code is selected on the page, otherwise it is blank.*/
$this->view->code = $this->view->codes ? (in_array($code, array_keys($this->view->codes)) ? $code : '') : $code;
$this->view->params = $this->blockZen->getAvailableParams($block->dashboard, $this->view->module, $this->view->code);
$this->view->codes = $codes;
/* $codes 包含 $code 时，页面才选中对应的 $code，否则为空。 */
/* Only when $codes have a value and contain $code, the corresponding $code is selected on the page, otherwise it is $blank. */
$this->view->code = in_array($code, array_keys($codes)) ? $code : '';
$this->view->params = $this->blockZen->getAvailableParams($this->view->module, $this->view->code);
$this->display();
}