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

* Code for task#49696.

Browse Source
This commit is contained in:
xieqiyu
2022-03-01 17:28:57 +08:00
parent 0e15ad41b6
commit 06af0ff6c4
5 changed files with 21 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+2 -9
View File
@@ -519,16 +519,9 @@ class execution extends control
if(isonlybody())
{
$kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $this->session->execLaneType ? $this->session->execLaneType : 'all');
$kanbanData = json_encode($kanbanData);
return print(js::reload('parent', '', "parent.parent.updateKanban($kanbanData)"));
// return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
return print(js::reload('parent'));
}
else
{
return print(js::reload('parent.parent'));
}
if(isonlybody()) return print(js::reload('parent.parent'));
return print(js::locate($this->createLink('execution', 'importBug', "executionID=$executionID"), 'parent'));
}
module/execution/js/importbug.js
+14
View File
@@ -1,4 +1,18 @@
$(function()
{
$(".preview").modalTrigger({width:1000, type:'iframe'});
$('#' + browseType + 'Tab').addClass('active');
if(isonlybody == true) parent.$('#triggerModal .modal-content .modal-header .close').hide();
});
/**
* Go back.
*
* @access public
* @return void
*/
function goback()
{
parent.location.reload();
}
module/execution/js/kanban.js
+2 -1
View File
@@ -966,6 +966,7 @@ function changeCardColType(cardID, fromColID, toColID, fromLaneID, toLaneID, car
*/
function updateKanban(kanbanData, regionID = 0)
{
console.log('1111');
setTimeout(function()
{
if(regionID)
@@ -1049,7 +1050,7 @@ function createStoryMenu(options)
var items = [];
var showAction = story.$col.type == 'backlog' || story.$col.type == 'ready' || story.$col.type == 'developing' || story.$col.type == 'developed' || story.$col.type == 'testing' || story.$col.type == 'tested' || story.$col.type == 'verified' || story.$col.type == 'released';
if(priv.canEditStory) items.push({label: storyLang.edit, icon: 'edit', url: createLink('story', 'edit', 'storyID=' + story.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
if(priv.canChangeStory && showAction) items.push({label: storyLang.change, icon: 'change', url: createLink('story', 'change', 'storyID=' + story.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
if(priv.canCreateTask && showAction) items.push({label: executionLang.wbs, icon: 'plus', url: createLink('task', 'create', 'executionID=' + execution.id + '&storyID=' + story.id, '', 'true'), className: 'iframe', attrs: {'data-toggle': 'modal', 'data-width': '80%'}});
module/execution/view/importbug.html.php
+2 -11
View File
@@ -13,10 +13,8 @@
<?php include '../../common/view/header.html.php';?>
<?php include '../../common/view/datepicker.html.php';?>
<?php include '../../common/view/tablesorter.html.php';?>
<script>
$(function(){$(".preview").modalTrigger({width:1000, type:'iframe'});});
var browseType = '<?php echo $browseType;?>';
</script>
<?php js::set('browseType', $browseType);?>
<?php js::set('isonlybody', isonlybody());?>
<style>#importBugForm .bug-pri {overflow: visible;}</style>
<div id='mainMenu' class='clearfix'>
<div class='btn-toolbar pull-left'>
@@ -86,11 +84,4 @@ var browseType = '<?php echo $browseType;?>';
</div>
</form>
</div>
<script>
$(function(){parent.$('#triggerModal .modal-content .modal-header .close').hide();})
function goback()
{
parent.location.reload();
}
</script>
<?php include '../../common/view/footer.html.php';?>
module/execution/view/kanban.html.php
+1 -1
View File
@@ -171,7 +171,7 @@ js::set('hasTaskButton', $hasTaskButton);
<?php if($canBatchCreateBug) echo '<li>' . html::a(helper::createLink('bug', 'batchCreate', "productID=$productID&branch=$branchID&executionID=$execution->id", '', true), $lang->bug->batchCreate, '', "class='iframe'") . '</li>';?>
<?php if(($hasStoryButton or $hasBugButton) and $hasTaskButton) echo '<li class="divider"></li>';?>
<?php if($canCreateTask) echo '<li>' . html::a(helper::createLink('task', 'create', "execution=$execution->id", '', true), $lang->task->create, '', "class='iframe'") . '</li>';?>
<?php if($canImportBug) echo '<li>' . html::a(helper::createLink('execution', 'importBug', "executionID=$execution->id", '', true), $lang->execution->importBug, '', "class='ifram'") . '</li>';?>
<?php if($canImportBug) echo '<li>' . html::a(helper::createLink('execution', 'importBug', "executionID=$execution->id", '', true), $lang->execution->importBug, '', "class='iframe'") . '</li>';?>
<?php if($canBatchCreateTask) echo '<li>' . html::a(helper::createLink('task', 'batchCreate', "execution=$execution->id", '', true), $lang->execution->batchCreateTask, '', "class='iframe'") . '</li>';?>
</ul>
</div>