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

Merge branch 'sprint/237_liumengyi_fixbug' into 'master'

Browse Source 
* Fix bug #26298, #25695, #27192, #25409, #27020, #23401.

See merge request easycorp/zentaopms!5262
This commit is contained in:
孙广明
2022-09-06 00:42:27 +00:00
parent 81223fe4c5 6a2deee711
commit a321b87f1c
13 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/css/create.css
+4
View File
@@ -14,6 +14,10 @@
#testStoryBox table tr td input {border: 0px;}
#testStoryBox table tr td .input-group .input-group-addon {border-left: 1px solid #dcdcdc; border-right: 1px solid #dcdcdc;}
#testStoryBox table button.btn {border: 0px;}
#testStoryBox .c-name {width: 300px;}
#testStoryBox .c-pri, #testStoryBox .c-estimate, #testStoryBox .c-actions {width: 70px;}
#testStoryBox .c-date {width: 140px;}
#testStoryBox .c-assignedTo {width: 100px; padding: 7px;}
.chosen-results > li.has-test,
.chosen-results > li.has-new-test {position: relative; color: #388E3C;}
module/task/lang/de.php
+1 -1
View File
@@ -166,7 +166,7 @@ $lang->task->recordEstimateAction = 'Record Estimate';
$lang->task->ditto = 'Dito';
$lang->task->dittoNotice = "Diese Aufgabe gehört nicht zum %s wie die Vorherige!";
$lang->task->selectTestStory = 'Select Story Tested';
$lang->task->selectTestStory = "Select {$lang->SRCommon}";
$lang->task->selectAllUser = 'Alle';
$lang->task->noStory = 'Keine Story';
$lang->task->noAssigned = 'Nicht zugeordnet';
module/task/lang/en.php
+1 -1
View File
@@ -166,7 +166,7 @@ $lang->task->recordEstimateAction = 'Record Estimate';
$lang->task->ditto = 'Ditto';
$lang->task->dittoNotice = "This Task is not linked to %s like the last one!";
$lang->task->selectTestStory = 'Select Story Tested';
$lang->task->selectTestStory = "Select {$lang->SRCommon}";
$lang->task->selectAllUser = 'All Users';
$lang->task->noStory = 'No Story Linked';
$lang->task->noAssigned = 'Unassigned';
module/task/lang/fr.php
+1 -1
View File
@@ -166,7 +166,7 @@ $lang->task->recordEstimateAction = 'Record Estimate';
$lang->task->ditto = 'Idem';
$lang->task->dittoNotice = "Cette Tâche n'est pas associée au %s comme la précédente peut l'être !";
$lang->task->selectTestStory = 'Select Story Testé';
$lang->task->selectTestStory = "Select {$lang->SRCommon}";
$lang->task->selectAllUser = 'Tous Utilis.';
$lang->task->noStory = 'Aucune Story associée';
$lang->task->noAssigned = 'Non affectées';
module/task/model.php
+10
View File
@@ -35,6 +35,16 @@ class taskModel extends model
if($this->post->selectTestStory)
{
foreach($this->post->testStory as $i => $storyID)
{
if(empty($storyID)) continue;
if($this->post->testEstStarted[$i] > $this->post->testDeadline[$i])
{
dao::$errors[] = "ID: $storyID {$this->lang->task->error->deadlineSmall}";
return false;
}
}
/* Check required fields when create test task. */
foreach($this->post->testStory as $i => $storyID)
{
module/task/view/create.html.php
+7 -7
View File
@@ -122,13 +122,13 @@ foreach(explode(',', $config->task->create->requiredFields) as $field)
<table class='table table-form mg-0 table-bordered'>
<thead>
<tr class='text-center'>
<th class='w-150px'><?php echo $lang->task->storyAB;?></th>
<th class='w-60px'><?php echo $lang->task->pri;?></th>
<th class='w-100px'><?php echo $lang->task->estStarted;?></th>
<th class='w-100px'><?php echo $lang->task->deadline;?></th>
<th class='w-60px'><?php echo $lang->task->assignedTo;?></th>
<th class='w-60px'><?php echo $lang->task->estimate;?></th>
<th class='w-60px'><?php echo $lang->actions;?></th>
<th class='c-name'><?php echo $lang->task->storyAB;?></th>
<th class='c-pri'><?php echo $lang->task->pri;?></th>
<th class='c-date'><?php echo $lang->task->estStarted;?></th>
<th class='c-date'><?php echo $lang->task->deadline;?></th>
<th class='c-assignedTo'><?php echo $lang->task->assignedTo;?></th>
<th class='c-estimate'><?php echo $lang->task->estimate;?></th>
<th class='c-actions'><?php echo $lang->actions;?></th>
</tr>
</thead>
<tbody class="resarch">