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

* Fix bug #44516.

Browse Source
This commit is contained in:
tianshujie
2024-01-22 09:24:05 +08:00
parent 523ba05e91
commit 7b5b3076d5
3 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/css/create.ui.css
+1
View File
@@ -3,3 +3,4 @@
.assignedToBox .add-team {margin-bottom: 5px}
.assignedToList {display: flex; align-items: center; overflow: hidden;}
.assignedToList .picker-multi-selection, .assignedToList .icon{margin-right: 5px; margin-bottom: 5px}
.panel-heading {z-index: 2 !important;}
module/task/js/create.ui.js
+22 -2
View File
@@ -77,10 +77,20 @@ function toggleSelectTestStory()
$('[data-name=datePlan]').addClass('hidden');
$('[data-name=estimate]').addClass('hidden');
$('[name=multiple]').closest('.checkbox-primary').addClass('hidden');
$('[data-name=testStoryBox]').removeClass('hidden');
$('#testStoryBox').load($.createLink('task', 'ajaxGetTestStories', 'executionID=' + executionID + '&taskID=' + taskID));
if($('[data-name=execution]').hasClass('hidden'))
{
$('[data-name=name]').removeClass('lite:w-full');
$('[data-name=pri]').removeClass('w-1/4').addClass('w-1/2 full:w-1/4');
$('[data-name=assignedToBox]').addClass('full:w-1/4');
}
else
{
$('[data-name=assignedToBox]').removeClass('w-1/2').addClass('w-1/4');
}
$('[name^=multiple]').prop('checked', false);
toggleTeam();
}
@@ -91,8 +101,18 @@ function toggleSelectTestStory()
$('[data-name=datePlan]').removeClass('hidden');
$('[data-name=estimate]').removeClass('hidden');
$('[name=multiple]').closest('.checkbox-primary').removeClass('hidden');
$('[data-name=testStoryBox]').addClass('hidden');
if($('[data-name=execution]').hasClass('hidden'))
{
$('[data-name=name]').addClass('lite:w-full');
$('[data-name=pri]').addClass('w-1/4').removeClass('w-1/2 full:w-1/4');
$('[data-name=assignedBox]').removeClass('full:w-1/4');
}
else
{
$('[data-name=assignedToBox]').removeClass('w-1/4').addClass('w-1/2');
}
}
}
module/task/ui/create.html.php
+3 -3
View File
@@ -27,17 +27,17 @@ $fields = useFields('task.create');
$fields->autoLoad('execution', 'execution,type,name,assignedToBox,region,lane,module,storyBox,datePlan,pri,estimate,desc,files,mailto,keywords,after,testStoryBox');
$fields->orders('name,assignedToBox', 'module,testStoryBox', 'desc,module,storyBox');
$fields->fullModeOrders('type,module,storyBox', 'desc,files,mailto,keywords');
$fields->fullModeOrders('type,module,storyBox,testStoryBox', 'desc,files,mailto,keywords');
if($execution->type == 'kanban')
{
$fields->orders('desc,module,storyBox', 'type,assignedToBox,region,lane');
$fields->fullModeOrders('name,assignedToBox', 'type,module,storyBox', 'desc,files,mailto,keywords');
$fields->fullModeOrders('name,assignedToBox', 'type,module,storyBox,testStoryBox', 'desc,files,mailto,keywords');
if(empty($features['story'])) $fields->fullModeOrders('type,module,storyBox', 'name,assignedToBox', 'desc,files,mailto,keywords');
}
if(empty($features['story']) && $execution->type != 'kanban')
{
$fields->fullModeOrders('type,module,storyBox,assignedToBox', 'desc,files,mailto,keywords');
$fields->fullModeOrders('type,module,storyBox,testStoryBox,assignedToBox', 'desc,files,mailto,keywords');
}
$teamForm = array();