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

* Modify code format.

Browse Source
This commit is contained in:
liumengyi
2022-01-19 17:24:15 +08:00
parent e02ec415c4
commit 9ef522cc46
6 changed files with 18 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/filter.php
View File

@@ -407,4 +407,4 @@ $filter->ci->checkCompileStatus->get['gitlabOnly'] = 'string';
$filter->tree->browse->cookie['preProductID'] = 'int';
$filter->tree->browse->cookie['preBranch'] = 'reg::word';
$filter->kanban->space->cookie['showClosed'] = 'code';
$filter->kanban->space->cookie['showClosed'] = 'code';

7
module/kanban/js/create.js
View File

@@ -1,11 +1,12 @@
/**
* Refresh page.
* When type change.
*
* @param string $type
* @oaram int spaceID
* @param string type
* @access public
* @return void
*/
function refreshPage(spaceID, type)
function changeType(spaceID, type)
{
location.href = createLink('kanban', 'create', 'spaceID=' + spaceID + '&type=' + type);
}

6
module/kanban/js/createspace.js
View File

@@ -1,11 +1,11 @@
/**
* Refresh page.
* When type change.
*
* @param string $type
* @param string type
* @access public
* @return void
*/
function refreshPage(type)
function changeType(type)
{
location.href = createLink('kanban', 'createSpace', 'type=' + type);
}

23
module/kanban/model.php
View File

@@ -1309,21 +1309,18 @@ class kanbanModel extends model
*
* @param string $browseType private|cooperation|public|involved
* @param object $pager
* @param int $closed 0|1
* @access public
* @return array
*/
public function getSpaceList($browseType, $pager = null, $closed = 0)
public function getSpaceList($browseType, $pager = null)
{
$account = $this->app->user->account;
$spaceIdList = $this->getCanViewObjects('kanbanspace');
$spaceList = $this->dao->select('*')->from(TABLE_KANBANSPACE)
->where('deleted')->eq(0)
->beginIF($browseType == 'private')->andWhere('type')->eq('private')->fi()
->beginIF($browseType == 'cooperation')->andWhere('type')->eq('cooperation')->fi()
->beginIF($browseType == 'public')->andWhere('type')->eq('public')->fi()
->beginIF(in_array($browseType, array('private', 'cooperation', 'public')))->andWhere('type')->eq($browseType)->fi()
->beginIF($browseType == 'involved')->andWhere('owner')->ne($account)->fi()
->beginIF($closed == 0)->andWhere('status')->ne('closed')->fi()
->beginIF($this->cookie->showClosed == 0)->andWhere('status')->ne('closed')->fi()
->beginIF(!$this->app->user->admin)->andWhere('id')->in($spaceIdList)->fi()
->orderBy('id_desc')
->page($pager)
@@ -1342,23 +1339,20 @@ class kanbanModel extends model
/**
* Get space pairs.
*
* @param string $browseType private|cooperation|public|involved|closed|noclosed
* @param $closed 0|1
* @param string $browseType private|cooperation|public|involved
* @access public
* @return array
*/
public function getSpacePairs($browseType = 'private', $closed = 0)
public function getSpacePairs($browseType = 'private')
{
$account = $this->app->user->account;
$spaceIdList = $this->getCanViewObjects('kanbanspace');
return $this->dao->select('id,name')->from(TABLE_KANBANSPACE)
->where('deleted')->eq(0)
->beginIF($browseType == 'private')->andWhere('type')->eq('private')->fi()
->beginIF($browseType == 'cooperation')->andWhere('type')->eq('cooperation')->fi()
->beginIF($browseType == 'public')->andWhere('type')->eq('public')->fi()
->beginIF(in_array($browseType, array('private', 'cooperation', 'public')))->andWhere('type')->eq($browseType)->fi()
->beginIF($browseType == 'involved')->andWhere('owner')->ne($account)->fi()
->beginIF($closed == 0)->andWhere('status')->ne('closed')->fi()
->beginIF($this->cookie->showClosed == 0)->andWhere('status')->ne('closed')->fi()
->beginIF(!$this->app->user->admin)->andWhere('id')->in($spaceIdList)->fi()
->orderBy('id_desc')
->fetchPairs('id');
@@ -1413,7 +1407,7 @@ class kanbanModel extends model
* @access public
* @return int
*/
public function createSpace($type)
public function createSpace()
{
$account = $this->app->user->account;
$space = fixer::input('post')
@@ -1421,7 +1415,6 @@ class kanbanModel extends model
->setDefault('createdDate', helper::now())
->setdefault('team', '')
->setdefault('owner', $account)
->setdefault('type', $type)
->setdefault('whitelist', '')
->join('whitelist', ',')
->join('team', ',')

2
module/kanban/view/create.html.php
View File

@@ -20,7 +20,7 @@
<table class='table table-form'>
<tr>
<th><?php echo $lang->kanbanspace->type;?></th>
<td><?php echo html::select('type', $typeList, $type, "onchange='refreshPage({$spaceID}, this.value)' class='form-control chosen'");?></td>
<td><?php echo html::select('type', $typeList, $type, "onchange='changeType({$spaceID}, this.value)' class='form-control chosen'");?></td>
<td></td>
</tr>
<tr>

2
module/kanban/view/createspace.html.php
View File

@@ -20,7 +20,7 @@
<table class='table table-form'>
<tr>
<th><?php echo $lang->kanbanspace->type;?></th>
<td><?php echo html::select('type', $typeList, $type, "onchange='refreshPage(this.value)' class='form-control'");?></td>
<td><?php echo html::select('type', $typeList, $type, "onchange='changeType(this.value)' class='form-control'");?></td>
<td></td>
</tr>
<tr>