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

*Story #31107.

Browse Source
This commit is contained in:
孙华伟
2022-03-08 14:41:51 +08:00
parent 03e3f26ad5
commit 67a0272d96
3 changed files with 53 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
-7
View File
@@ -2502,13 +2502,6 @@ class execution extends control
return print(js::reload('parent'));
}
}
//public function deleteBug($bugID, $confirm = 'no')
//{
// if($confirm == 'no')
// {
// return print();
// }
//}
/**
* Manage products.
module/execution/js/kanban.js
+32 -2
View File
@@ -969,6 +969,35 @@ function changeCardColType(cardID, fromColID, toColID, fromLaneID, toLaneID, car
modalTrigger.show();
}
}
/**
* Delete a card.
*
* @param string objectType
* @param int objectID
* @param int regionID
* @access public
* @return void
*/
function deleteCard(objectType, objectID, regionID)
{
var objectLang = objectType + 'Lang';
var result = confirm(window[objectLang].confirmDelete) ? true : false;
if(!result) return false;
if(!objectID) return false;
var url = createLink('kanban', 'deleteObjectCard', 'objectType=' + objectType + '&objectID=' + objectID + '&regionID=' + regionID);
return $.ajax(
{
method: 'post',
dataType: 'json',
url: url,
success: function(data)
{
updateRegion(regionID, data[regionID]);
}
});
}
/**
* Close modal and update kanban data.
@@ -1070,7 +1099,7 @@ function createStoryMenu(options)
if(priv.canBatchCreateTask && showAction) items.push({label: executionLang.batchWBS, icon: 'pluses', url: createLink('task', 'batchCreate', 'executionID=' + execution.id + '&storyID=' + story.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
if(priv.canActivateStory && story.$col.type == 'closed') items.push({label: executionLang.activate, icon: 'magic', url: createLink('story', 'activate', 'storyID=' + story.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
if(priv.canUnlinkStory) items.push({label: executionLang.unlinkStory, icon: 'unlink', url: createLink('execution', 'unlinkStory', 'executionID=' + execution.id + '&storyID=' + story.id, '', 'false'), attrs: {target: 'hiddenwin'}});
if(priv.canDeleteStory) items.push({label: storyLang.delete, icon: 'trash', url: createLink('story','delete','storyID=' + story.id, '', 'false'), attrs: {'target': 'hiddenwin'}});
if(priv.canDeleteStory) items.push({label: storyLang.delete, icon: 'trash', onClick: function(){deleteCard('story', story.id, story.$lane.region)}});
return items;
}
@@ -1090,7 +1119,7 @@ function createTaskMenu(options)
if(priv.canActivateTask && (task.$col.type == 'developed' || task.$col.type == 'canceled' || task.$col.type == 'closed')) items.push({label: executionLang.activate, icon: 'magic', url: createLink('task', 'activate', 'taskID=' + task.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
if(priv.canCreateTask) items.push({label: taskLang.copy, icon: 'copy', url: createLink('task', 'create', 'executionID=' + executionID + '&storyID=' + '0' + '&moduleID=' + '0' + '&taskID=' + task.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
if(priv.canCancelTask && (task.$col.type == 'wait' || task.$col.type == 'developing' || task.$col.type == 'pause')) items.push({label: taskLang.cancel, icon: 'cancel', url: createLink('task', 'cancel', 'taskID=' + task.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
if(priv.canDeleteTask) items.push({label: taskLang.delete, icon: 'trash', url: createLink('task', 'delete', 'executionID=' + executionID + '&bugID=' + task.id, '', 'false'), attrs: {'target': 'hiddenwin'}});
if(priv.canDeleteTask) items.push({label: taskLang.delete, icon: 'trash', onClick: function(){deleteCard('task', task.id, task.$lane.region)}});
return items;
}
@@ -1111,6 +1140,7 @@ function createBugMenu(options)
if(priv.canToStoryBug && (bug.$col.type != 'closed')) items.push({label: bugLang.toStory, icon: 'lightbulb', url: createLink('story', 'create', 'product=' + productID + '&branch=' + '0' + '&module=' + '0' + '&story=' + '0' + '&execution=' + '0' + '&bugID=' + bug.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
if(priv.canActivateBug && (bug.$col.type == 'fixed') || bug.$col.type == 'testing' || bug.$col.type == 'tested' || bug.$col.type == 'closed') items.push({label: bugLang.activate, icon: 'magic', url: createLink('bug', 'activate', 'bugID=' + bug.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
if(priv.canDeleteBug) items.push({label: bugLang.delete, icon: 'trash', url: createLink('bug', 'delete', 'bugID=' + bug.id, '', 'false'), attrs: {'target': 'hiddenwin'}});
if(priv.canDeleteBug) items.push({label: bugLang.delete, icon: 'trash', onClick: function(){deleteCard('bug', bug.id, bug.$lane.region)}});
return items;
}
module/kanban/control.php
+21
View File
@@ -933,6 +933,27 @@ class kanban extends control
return print(json_encode($kanbanGroup));
}
/**
* Delete a card.
*
* @param string $objectType story|task|bug
* @param int $objectID
* @param int $regionID
* @access public
* @return void
*/
public function deleteObjectCard($objectType, $objectID, $regionID)
{
$table = 'TABLE_' . strtoupper($objectType);
$this->loadModel($objectType)->delete(constant($table), $objectID);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
$kanbanID = $this->dao->select('kanban')->from(TABLE_KANBANREGION)->where('id')->eq($regionID)->fetch('kanban');
$kanbanGroup = $this->kanban->getRDKanban($kanbanID);
return print(json_encode($kanbanGroup));
}
/**
* View a card.
*