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

* Fix add block type selection.

Browse Source
This commit is contained in:
leiyong
2020-09-14 15:22:46 +08:00
parent fc526b3824
commit 03d1e43dac
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/control.php
+11 -8
View File
@@ -754,8 +754,11 @@ class block extends control
{
$this->app->loadLang('project');
$this->app->loadLang('task');
$count = isset($this->params->count) ? $this->params->count : 15;
$type = isset($this->params->type) ? $this->params->type : 'all';
$orderBy = isset($this->params->orderBy) ? $this->params->orderBy : 'id_desc';
$this->view->programs = $this->loadModel('program')->getProgramOverview('byStatus', 'all', $this->params->orderBy, $this->params->count);
$this->view->programs = $this->loadModel('program')->getProgramOverview('byStatus', $type, $orderBy, $count);
$this->view->users = $this->loadModel('user')->getPairs('noletter');
}
@@ -1399,11 +1402,10 @@ class block extends control
if(!is_numeric($productID)) $productID = key($products);
$this->view->roadmaps = $this->product->getRoadmap($productID, 0, 6);
$this->view->productID = $productID;
$this->view->roadMapID = $roadMapID;
$this->view->products = $products;
$this->view->sync = 1;
$this->view->productID = $productID;
$this->view->roadMapID = $roadMapID;
$this->view->products = $products;
$this->view->sync = 1;
if($_POST)
{
@@ -1740,11 +1742,12 @@ class block extends control
{
$this->loadModel('project');
$count = isset($this->params->count) ? (int)$this->params->count : 15;
$count = isset($this->params->count) ? $this->params->count : 15;
$status = isset($this->params->type) ? $this->params->type : 'doing';
$orderBy = isset($this->params->orderBy) ? $this->params->orderBy : 'id_desc';
/* Get projects. */
$this->view->programs = $this->loadModel('program')->getProgramOverview('byStatus', 'doing', $orderBy, $count);
$this->view->programs = $this->loadModel('program')->getProgramOverview('byStatus', $status, $orderBy, $count);
}
/**
module/block/model.php
+3 -9
View File
@@ -846,9 +846,7 @@ class blockModel extends model
*/
public function getScrumOverviewParams($module = '')
{
$params = $this->appendCountParams();
return json_encode($params);
return false;
}
/**
@@ -860,9 +858,7 @@ class blockModel extends model
*/
public function getScrumRoadMapParams($module = '')
{
$params = $this->appendCountParams();
return json_encode($params);
return false;
}
/**
@@ -903,9 +899,7 @@ class blockModel extends model
*/
public function getSprintParams($module = '')
{
$params = $this->appendCountParams();
return json_encode($params);
return false;
}
/**