* Adjust block module code.

This commit is contained in:
leiyong
2021-03-09 15:03:25 +08:00
parent bd061f23dd
commit fb89b18fd9
3 changed files with 18 additions and 23 deletions
+3 -10
View File
@@ -65,10 +65,11 @@ class block extends control
elseif(isset($this->lang->block->moduleList[$module]))
{
$this->get->set('mode', 'getblocklist');
if($module == 'program') $this->get->set('dashboard', 'program');
if($module == 'project') $this->get->set('dashboard', 'project');
$this->view->blocks = $this->fetch('block', 'main', "module=$module&id=$id");
$this->view->module = $module;
}
$this->view->title = $title;
$this->view->block = $this->block->getByID($id);
$this->view->blockID = $id;
@@ -219,14 +220,6 @@ class block extends control
$commonField = $project->model . 'common';
}
/* Replace the block Title saved in the database. */
if($module == 'execution')
{
$projectBlock = array();
foreach($this->lang->block->default['execution'] as $block) $projectBlock[$block['block']] = $block['title'];
foreach($blocks as $block) $block->title = $projectBlock[$block->block];
}
$inited = empty($this->config->$module->$commonField->blockInited) ? '' : $this->config->$module->$commonField->blockInited;
/* Init block when vist index first. */
@@ -1347,7 +1340,7 @@ class block extends control
$releases = array();
$count = isset($this->params->count) ? (int)$this->params->count : 15;
$products = $this->dao->select('id, name')->from(TABLE_PRODUCT)->where('program')->eq($this->session->project)->limit(15)->fetchPairs();
$products = $this->dao->select('id, name')->from(TABLE_PRODUCT)->where('program')->eq($this->session->program)->limit(15)->fetchPairs();
$productIdList = array_keys($products);
if(!empty($productIdList))
{