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

* kanban: refactor ajaxLoadUsers().

Browse Source
This commit is contained in:
sunguangming
2023-12-16 16:08:43 +08:00
parent e3d11bcb53
commit 8a6337405e
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/control.php
+5 -4
View File
@@ -1599,6 +1599,7 @@ class kanban extends control
}
/**
* 获取看板左上角下拉菜单。
* Ajax get kanban menu.
*
* @param int $kanbanID
@@ -1607,7 +1608,7 @@ class kanban extends control
* @access public
* @return void
*/
public function ajaxGetDropMenu($kanbanID, $moduleName, $methodName)
public function ajaxGetDropMenu(int $kanbanID, string $moduleName, string $methodName)
{
$kanbanIdList = $this->kanban->getCanViewObjects();
$spacePairs = $this->kanban->getSpacePairs('showClosed');
@@ -1627,6 +1628,7 @@ class kanban extends control
}
/**
* 获取区域中的泳道。
* Ajax get lanes by region id.
*
* @param int $regionID
@@ -1636,7 +1638,7 @@ class kanban extends control
* @access public
* @return string
*/
public function ajaxGetLanes($regionID, $type = 'all', $field = 'otherLane', $pageType = '')
public function ajaxGetLanes(int $regionID, string $type = 'all', string $field = 'otherLane', string $pageType = '')
{
$lanes = $this->kanban->getLanePairsByRegion($regionID, $type);
@@ -1654,12 +1656,11 @@ class kanban extends control
*
* @param int $spaceID
* @param string $field team|whitelist|owner
* @param string $selectedUser
* @param string $space all|space
* @access public
* @return string
*/
public function ajaxLoadUsers($spaceID, $field = '', $selectedUser = '', $type = 'space')
public function ajaxLoadUsers(int $spaceID, string $field = '', string $type = 'space')
{
$space = $this->kanban->getSpaceById($spaceID);
$accounts = '';
module/kanban/js/common.ui.js
+3 -3
View File
@@ -42,7 +42,7 @@ window.changeKanbanType = function()
window.loadAllUsers = function()
{
const link = $.createLink('kanban', 'ajaxLoadUsers', 'spaceID=0&field=owner&selectedUser=' + $('[name=owner]').val() + "&type=all");
const link = $.createLink('kanban', 'ajaxLoadUsers', 'spaceID=0&field=owner&type=all');
$.getJSON(link, function(data)
{
$('[name=owner]').zui('picker').render({items: data});
@@ -54,7 +54,7 @@ window.changeKanbanSpace = function()
const spaceID = $('[name=space]').val();
if(spaceType == 'private')
{
const url = $.createLink('kanban', 'ajaxLoadUsers', 'spaceID=' + spaceID + '&field=whitelist&selectedUser=' + $('[name^=whitelist]').val());
const url = $.createLink('kanban', 'ajaxLoadUsers', 'spaceID=' + spaceID + '&field=whitelist');
$.getJSON(url, function(data)
{
$('[name^=whitelist]').zui('picker').render({items: data});
@@ -62,7 +62,7 @@ window.changeKanbanSpace = function()
}
else
{
url = $.createLink('kanban', 'ajaxLoadUsers', 'spaceID=' + spaceID + '&field=owner&selectedUser=' + $('[name=owner]').val());
url = $.createLink('kanban', 'ajaxLoadUsers', 'spaceID=' + spaceID + '&field=owner');
$.getJSON(url, function(data)
{
$('[name=owner]').zui('picker').render({items: data});