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

Merge branch 'sprint/183_liumengyi_fixbug' into 'master'

Browse Source 
* Kanban whitelist can only be selected from space whitelist.

See merge request easycorp/zentaopms!1671
This commit is contained in:
孙广明
2022-01-27 05:01:27 +00:00
parent 906f6eadd2 221909550d
commit d1cc0d0161
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/control.php
+2
View File
@@ -172,6 +172,7 @@ class kanban extends control
$users = $this->loadModel('user')->getPairs('noclosed|nodeleted', '', 0, $spaceUsers);
$this->view->users = $users;
$this->view->whitelist = $this->user->getPairs('noclosed|nodeleted', '', 0, $space->whitelist);
$this->view->spaceID = $spaceID;
$this->view->spacePairs = array(0 => '') + $this->kanban->getSpacePairs($type);
$this->view->type = $type;
@@ -208,6 +209,7 @@ class kanban extends control
$users = $this->loadModel('user')->getPairs('noclosed|nodeleted', '', 0, $spaceUsers);
$this->view->users = $users;
$this->view->whitelist = $this->user->getPairs('noclosed|nodeleted', '', 0, $space->whitelist);
$this->view->spacePairs = array(0 => '') + array($kanban->space => $space->name) + $this->kanban->getSpacePairs($space->type);
$this->view->kanban = $kanban;
$this->view->type = $space->type;
module/kanban/view/create.html.php
+1 -1
View File
@@ -57,7 +57,7 @@
<?php if($type == 'private'):?>
<tr id="whitelistBox">
<th><?php echo $lang->whitelist;?></th>
<td><?php echo html::select('whitelist[]', $users, '', 'class="form-control chosen" multiple');?></td>
<td><?php echo html::select('whitelist[]', $whitelist, '', 'class="form-control chosen" multiple');?></td>
</tr>
<?php endif;?>
<tr>
module/kanban/view/edit.html.php
+1 -1
View File
@@ -50,7 +50,7 @@
<?php if($type == 'private'):?>
<tr id="whitelistBox">
<th><?php echo $lang->whitelist;?></th>
<td><?php echo html::select('whitelist[]', $users, $kanban->whitelist, 'class="form-control chosen" multiple');?></td>
<td><?php echo html::select('whitelist[]', $whitelist, $kanban->whitelist, 'class="form-control chosen" multiple');?></td>
</tr>
<?php endif;?>
<tr>