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

* Fix edit a block error.

Browse Source
This commit is contained in:
Yagami
2020-09-03 10:48:04 +08:00
parent a3528943e7
commit 8041e2dc32
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/control.php
+14 -7
View File
@@ -415,16 +415,25 @@ class block extends control
if($mode == 'getblocklist')
{
$program = '';
$template = '';
$block = $this->block->getByID($id);
$dashboard = $this->get->dashboard;
/* Create a program block. */
if($dashboard == 'program')
{
$programID = $this->session->program;
$program = $this->loadModel('project')->getByID($programID);
$program = $this->loadModel('project')->getByID($this->session->program);
$template = $program->template;
}
$blocks = $this->block->getAvailableBlocks($module, $dashboard, $program);
/* Edit a program block. */
if($id and $block->module == 'program')
{
$template = $block->type;
$dashboard = 'program';
}
$blocks = $this->block->getAvailableBlocks($module, $dashboard, $template);
if(!$this->selfCall)
{
echo $blocks;
@@ -434,12 +443,10 @@ class block extends control
$blocks = json_decode($blocks, true);
$blockPairs = array('' => '') + $blocks;
$block = $this->block->getByID($id);
echo '<div class="form-group">';
echo '<label for="moduleBlock" class="col-sm-3">' . $this->lang->block->lblBlock . '</label>';
echo '<div class="col-sm-7">';
if(isset($program->template)) echo html::hidden('type', $program->template);
if($template) echo html::hidden('type', $template);
echo html::select('moduleBlock', $blockPairs, ($block and $block->source != '') ? $block->block : '', "class='form-control chosen'");
echo '</div></div>';
}