* adjust for project kanban.

This commit is contained in:
王怡栋
2022-01-17 17:25:20 +08:00
parent 5dad24d03a
commit d8577f7d28
21 changed files with 410 additions and 351 deletions

View File

@@ -111,6 +111,7 @@ class project extends control
$projects = $this->dao->select('*')->from(TABLE_PROJECT)
->where('type')->eq('project')
->andWhere('deleted')->eq(0)
->andWhere('vision')->eq($this->config->vision)
->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
->orderBy('order_asc')
->fetchAll('id');

View File

@@ -1845,6 +1845,7 @@ class projectModel extends model
->beginIF($status == 'undone')->andWhere('t1.status')->notIN('done,closed')->fi()
->beginIF($status != 'all' and $status != 'undone' and $status != 'involved')->andWhere('t1.status')->eq($status)->fi()
->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->sprints)->fi()
->andWhere('t1.vision')->eq($this->config->vision)
->andWhere('t1.deleted')->eq('0')
->orderBy($orderBy)
->page($pager)
@@ -1861,6 +1862,7 @@ class projectModel extends model
->beginIF($status != 'all' and $status != 'undone')->andWhere('t2.status')->eq($status)->fi()
->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->sprints)->fi()
->andWhere('t2.deleted')->eq('0')
->andWhere('t1.vision')->eq($this->config->vision)
->orderBy($orderBy)
->page($pager)
->fetchAll('id');

View File

@@ -92,7 +92,7 @@
$setting = $this->datatable->getSetting('project');
$fixedFieldsWidth = $this->datatable->setFixedFieldWidth($setting);
if($useDatatable) include '../../common/view/datatable.html.php';
if($useDatatable) include dirname(dirname(dirname(__FILE__))) . '/common/view/datatable.html.php';
?>
<?php if(!$useDatatable) echo '<div class="table-responsive">';?>
<table class='table has-sort-head <?php if($useDatatable) echo 'datatable';?>' data-fixed-left-width='<?php echo $fixedFieldsWidth['leftWidth']?>' data-fixed-right-width='<?php echo $fixedFieldsWidth['rightWidth']?>'>