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

Merge branch 'sprint/215_tianshujie_25128' into 'master'

Browse Source 
Sprint/215 tianshujie 25128

See merge request easycorp/zentaopms!4483
This commit is contained in:
王怡栋
2022-07-12 09:21:23 +00:00
parent c2c5b59856 d1ed09e9bb
commit 42cd9ccc98
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
module/kanban/css/create.css
View File

@@ -22,3 +22,4 @@
#copyKanbanModal .copyContentBox {display: inline-block;}
#copyKanbanModal .copyContentBox > .checkbox-primary {display: inline-block; margin-left: 10px; margin-top: -1px;}
#copyKanbanModal .copyContentBox > .checkbox-primary:first-child {margin-left: 20px;}
#copyContentbasicInfo {cursor: not-allowed;}

4
module/kanban/model.php
View File

@@ -1877,11 +1877,11 @@ class kanbanModel extends model
* Get can view objects.
*
* @param string $objectType kanbanspace|kanban
* @param string $param noclosed|private|cooperation|public|involved
* @param string $param all|noclosed|private|cooperation|public|involved
* @access public
* @return array
*/
public function getCanViewObjects($objectType = 'kanban', $param = '')
public function getCanViewObjects($objectType = 'kanban', $param = 'all')
{
$table = $this->config->objectTables[$objectType];
$objects = $this->dao->select('*')->from($table)

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

@@ -60,7 +60,7 @@
<?php endif;?>
<tr>
<th class='columnWidth'><?php echo $lang->kanban->columnWidth;?></th>
<td><?php echo nl2br(html::radio('fluidBoard', $lang->kanbancolumn->fluidBoardList, isset($copyKanban->fluidBoard) ? isset($copyKanban->fluidBoard) : 0));?></td>
<td><?php echo nl2br(html::radio('fluidBoard', $lang->kanbancolumn->fluidBoardList, isset($copyKanban->fluidBoard) ? $copyKanban->fluidBoard : 0));?></td>
</tr>
<tr>
<th rowspan='2'><?php echo $lang->kanban->import?></th>