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

* Finish task#95327. Show customized icon for project view.

Browse Source
This commit is contained in:
dingguodong
2023-06-19 14:03:55 +08:00
parent a3b0794967
commit 0725d8e372
4 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/datatable/config.php
-1
View File
@@ -3,7 +3,6 @@ $config->datatable->moduleAlias['product-browse'] = 'story';
$config->datatable->moduleAlias['execution-story'] = 'story';
$config->datatable->moduleAlias['execution-task'] = 'task';
$config->datatable->moduleAlias['program-project'] = 'project';
$config->datatable->moduleAlias['program-browse'] = 'project';
$config->datatable->moduleAlias['project-bug'] = 'bug';
$config->datatable->moduleAlias['execution-bug'] = 'bug';
$config->datatable->moduleAlias['my-bug'] = 'bug';
module/datatable/control.php
+7
View File
@@ -144,6 +144,13 @@ class datatable extends control
$module = zget($this->config->datatable->moduleAlias, "$module-$method", $module);
$setting = '';
if(isset($this->config->datatable->$target->cols)) $setting = $this->config->datatable->$target->cols;
if($module == 'program' and $method == 'browse')
{
$method = 'projectView'; /* Use projectView datatable setting in program module . */
$setting = $this->config->datatable->programProjectView->cols; /* Use the customized table data from database. */
}
if(empty($setting))
{
$cols = $this->datatable->getFieldList($module, $method);
module/datatable/model.php
+8
View File
@@ -92,9 +92,17 @@ class datatableModel extends model
$datatableId = $module . ucfirst($method);
$module = zget($this->config->datatable->moduleAlias, "$module-$method", $module);
if(!isset($this->config->$module)) $this->loadModel($module);
if(isset($this->config->datatable->$datatableId->cols)) $setting = json_decode($this->config->datatable->$datatableId->cols, true);
if($module == 'program' and $method == 'browse')
{
$method = 'projectView'; /* Use projectView datatable setting in program module . */
$setting = json_decode($this->config->datatable->programProjectView->cols, true); /* Fetch the customized table data from database. */
}
$fieldList = $this->getFieldList($module, $method);
if(empty($setting))
{
module/program/ui/browse.html.php
+1 -1
View File
@@ -1,7 +1,7 @@
<?php
namespace zin;
$cols = array_values($config->program->projectView->dtable->fieldList);
$cols = $this->loadModel('datatable')->getSetting('program');
$data = array();
foreach($programs as $program)
{