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

Merge branch 'sprint/237_liumengyi_fixbug'

Browse Source
This commit is contained in:
wangyidong
2022-09-09 15:19:04 +08:00
parent 1bb552b34d b1c87862f2
commit 4bd3d07e34
30 changed files with 49 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/story/ext/view/view.html.php
+2 -2
View File
@@ -110,7 +110,7 @@
common::printIcon('story', 'change', "storyID=$child->id", $child, 'list', 'alter');
if(strpos('draft,changing', $child->status) !== false)
{
common::printIcon('story', 'submitReview', "storyID=$child->id", $child, 'list', 'sub-review', '', 'iframe showinonlybody', true);
common::printIcon('story', 'submitReview', "storyID=$child->id", $child, 'list', 'confirm', '', 'iframe showinonlybody', true);
}
else
{
@@ -143,7 +143,7 @@
common::printIcon('story', 'change', "storyID=$story->id", $story, 'button', 'alter', '', 'showinonlybody');
if(strpos('draft,changing', $story->status) !== false)
{
common::printIcon('story', 'submitReview', "storyID=$story->id", $story, 'button', 'sub-review', '', 'iframe showinonlybody', true);
common::printIcon('story', 'submitReview', "storyID=$story->id", $story, 'button', 'confirm', '', 'iframe showinonlybody', true);
}
else
{
module/bug/control.php
+1 -1
View File
@@ -525,7 +525,7 @@ class bug extends control
$severity = $bug->severity;
$type = $bug->type;
$assignedTo = $bug->assignedTo;
$deadline = $bug->deadline;
$deadline = helper::isZeroDate($bug->deadline) ? '' : $bug->deadline;
$color = $bug->color;
$testtask = $bug->testtask;
if($pri == 0) $pri = '3';
module/bug/lang/de.php
+3 -2
View File
@@ -187,10 +187,11 @@ $lang->bug->allUsers = 'Alle Benutzer laden';
$lang->bug->allBuilds = 'Alle';
$lang->bug->createBuild = 'Neu';
/* Legend list。*/
global $config;
/* Legend list. */
$lang->bug->legendBasicInfo = 'Basis Info';
$lang->bug->legendAttatch = 'Anlagen';
$lang->bug->legendPRJExecStoryTask = 'Project/' . $lang->executionCommon . '/Story/Task';
$lang->bug->legendPRJExecStoryTask = $config->systemMode == 'new' ? 'Project/' . $lang->executionCommon . '/Story/Task' : $lang->executionCommon . '/Story/Task';
$lang->bug->legendExecStoryTask = $lang->executionCommon . '/Story/Task';
$lang->bug->lblTypeAndSeverity = 'Typ/Schwere';
$lang->bug->lblSystemBrowserAndHardware = 'System/Browser';
module/bug/lang/en.php
+3 -2
View File
@@ -187,10 +187,11 @@ $lang->bug->allUsers = 'Load All Users';
$lang->bug->allBuilds = 'All Builds';
$lang->bug->createBuild = 'New';
/* Legend list。*/
global $config;
/* Legend list. */
$lang->bug->legendBasicInfo = 'Basic Info';
$lang->bug->legendAttatch = 'Files';
$lang->bug->legendPRJExecStoryTask = 'Project/' . $lang->executionCommon . '/Story/Task';
$lang->bug->legendPRJExecStoryTask = $config->systemMode == 'new' ? 'Project/' . $lang->executionCommon . '/Story/Task' : $lang->executionCommon . '/Story/Task';
$lang->bug->legendExecStoryTask = $lang->executionCommon . '/Story/Task';
$lang->bug->lblTypeAndSeverity = 'Type/Severity';
$lang->bug->lblSystemBrowserAndHardware = 'System/Browser';
module/bug/lang/fr.php
+3 -2
View File
@@ -187,10 +187,11 @@ $lang->bug->allUsers = 'Charger Tous';
$lang->bug->allBuilds = 'Tous les Builds';
$lang->bug->createBuild = 'Nouveau';
/* Legend list。*/
global $config;
/* Legend list. */
$lang->bug->legendBasicInfo = 'Infos de Base';
$lang->bug->legendAttatch = 'Fichiers';
$lang->bug->legendPRJExecStoryTask = 'Project/' . $lang->executionCommon . '/Story/Task';
$lang->bug->legendPRJExecStoryTask = $config->systemMode == 'new' ? 'Project/' . $lang->executionCommon . '/Story/Task' : $lang->executionCommon . '/Story/Task';
$lang->bug->legendExecStoryTask = $lang->executionCommon . '/Story/Tâche';
$lang->bug->lblTypeAndSeverity = 'Type/Severité';
$lang->bug->lblSystemBrowserAndHardware = 'Système/Browser';
module/bug/lang/zh-cn.php
+2 -1
View File
@@ -187,10 +187,11 @@ $lang->bug->allUsers = '加载所有用户';
$lang->bug->allBuilds = '所有';
$lang->bug->createBuild = '创建';
global $config;
/* legend列表。*/
$lang->bug->legendBasicInfo = '基本信息';
$lang->bug->legendAttatch = '附件';
$lang->bug->legendPRJExecStoryTask = "项目/" . $lang->executionCommon . "/{$lang->SRCommon}/任务";
$lang->bug->legendPRJExecStoryTask = $config->systemMode == 'new' ? "项目/" . $lang->executionCommon . "/{$lang->SRCommon}/任务" : $lang->executionCommon . "/{$lang->SRCommon}/任务";
$lang->bug->legendExecStoryTask = $lang->executionCommon . "/{$lang->SRCommon}/任务";
$lang->bug->lblTypeAndSeverity = '类型/严重程度';
$lang->bug->lblSystemBrowserAndHardware = '系统/浏览器';
module/bug/model.php
+1 -1
View File
@@ -3279,7 +3279,7 @@ class bugModel extends model
$title = "title='" . zget($projectPairs, $bug->project, '') . "'";
break;
case 'plan':
$title = "title='" . zget($plans, $bug->plan) . "'";
$title = "title='" . zget($plans, $bug->plan, '') . "'";
break;
case 'execution':
$title = "title='" . zget($executions, $bug->execution) . "'";
module/build/view/linkstory.html.php
+1 -1
View File
@@ -47,7 +47,7 @@
<td><span class='label-pri label-pri-<?php echo $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri)?></span></td>
<td class='text-left nobr' title='<?php echo $story->title?>'>
<?php
if($story->parent > 0) echo "<span class='label'>{$lang->story->childrenAB}</span>";
if($story->parent > 0) echo "<span class='label label-badge label-light'>{$lang->story->childrenAB}</span>";
echo html::a($this->createLink('story', 'view', "storyID=$story->id&version=0&param=$objectID", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");
?>
</td>
module/build/view/view.html.php
+1 -1
View File
@@ -103,7 +103,7 @@ tbody tr td:first-child input {display: none;}
<td><span class='label-pri label-pri-<?php echo $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
<td class='text-left nobr' title='<?php echo $story->title?>'>
<?php
if($story->parent > 0) echo "<span class='label'>{$lang->story->childrenAB}</span>";
if($story->parent > 0) echo "<span class='label label-badge label-light'>{$lang->story->childrenAB}</span>";
if($this->app->tab == 'execution' and common::hasPriv('execution', 'storyView'))
{
echo html::a($this->createLink('execution', 'storyView', "storyID=$story->id", '', true), $story->title, '', isonlybody() ? "data-width='1000'" : "class='iframe' data-width='1000'");
module/doc/css/createbasicinfo.css
+2
View File
@@ -1 +1,3 @@
#whiteListBox .input-group:last-child {margin-top: 10px;}
#dataform .radio-inline.hidden + .radio-inline {margin-left: 0px;}
#module_chosen.chosen-container .chosen-results {max-height: 200px;}
module/doc/css/tablecontents.css
+1 -1
View File
@@ -9,7 +9,7 @@
.no-content-button a:nth-child(2) {margin-left: 20px;}
.cell .detail .detail-title {padding-left: 5px; list-style: none;}
.menu-actions {position: relative; float: right; top: -34px; right: -15px; padding: 7px 8px;}
.menu-actions {position: absolute; top: 7px; right: 45px; padding: 7px 8px;}
.detail ul {position: relative;}
.tail-info {position: absolute; right: 0; padding-left: 10px; padding-top: 1px;}
.tail-info, .doc-title, span.item {background: #fff;}
module/doc/view/createbasicinfo.html.php
+1 -1
View File
@@ -31,7 +31,7 @@
<tr>
<th><?php echo $lang->doc->module;?></th>
<td>
<span id='moduleBox'><?php echo html::select('module', $moduleOptionMenu, $moduleID, "class='form-control chosen'");?></span>
<span id='moduleBox'><?php echo html::select('module', $moduleOptionMenu, $moduleID, "class='form-control chosen' data-drop_direction='down'");?></span>
</td><td></td>
</tr>
<tr>
module/execution/view/linkstory.html.php
+1 -1
View File
@@ -66,7 +66,7 @@
<td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
<td class='text-left nobr' title="<?php echo $story->title?>">
<?php
if($story->parent > 0) echo "<span class='label'>{$lang->story->childrenAB}</span>";
if($story->parent > 0) echo "<span class='label label-badge label-light'>{$lang->story->childrenAB}</span>";
if(common::hasPriv('execution', 'storyView'))
{
echo html::a($storyLink, $story->title, '', "class='iframe' data-width='80%'");
module/my/view/requirement.html.php
+2 -2
View File
@@ -107,7 +107,7 @@
if(strpos('draft,changing', $story->status) !== false)
{
echo common::buildIconButton('story', 'submitReview', "$vars&storyType=requirement", $story, 'list', 'sub-review', '', 'iframe', true);
echo common::buildIconButton('story', 'submitReview', "$vars&storyType=requirement", $story, 'list', 'confirm', '', 'iframe', true);
}
else
{
@@ -155,7 +155,7 @@
if(strpos('draft,changing', $child->status) !== false)
{
common::printIcon('story', 'submitReview', "$vars&storyType=story", $child, 'list', 'sub-review', '', 'iframe', true);
common::printIcon('story', 'submitReview', "$vars&storyType=story", $child, 'list', 'confirm', '', 'iframe', true);
}
else
{
module/my/view/story.html.php
+2 -2
View File
@@ -108,7 +108,7 @@
if(strpos('draft,changing', $story->status) !== false)
{
echo common::buildIconButton('story', 'submitReview', $vars, $story, 'list', 'sub-review', '', 'iframe', true);
echo common::buildIconButton('story', 'submitReview', $vars, $story, 'list', 'confirm', 'confirm', 'iframe', true);
}
else
{
@@ -158,7 +158,7 @@
if(strpos('draft,changing', $child->status) !== false)
{
common::printIcon('story', 'submitReview', $vars, $child, 'list', 'sub-review', '', 'iframe', true);
common::printIcon('story', 'submitReview', $vars, $child, 'list', 'confirm', '', 'iframe', true);
}
else
{
module/product/view/ajaxgetdropmenu.html.php
+1 -1
View File
@@ -26,7 +26,7 @@
#swapper .tree li>.list-toggle {top: -1px;}
#subHeader .tree ul {display: block;}
#closed {width: 90px; height: 25px; line-height: 25px; background-color: #ddd; color: #3c495c; text-align: center; margin-left: 15px; border-radius: 2px;}
div#closed {width: 90px; height: 25px; line-height: 25px; background-color: #ddd; color: #3c495c; text-align: center; margin-left: 15px; border-radius: 2px;}
#gray-line {width: 230px; height: 1px; margin-left: 10px; margin-bottom:2px; background-color: #ddd;}
#swapper li >.selected {color: #0c64eb!important;background: #e9f2fb!important;}
</style>
module/project/css/create.css
+2 -1
View File
@@ -17,11 +17,12 @@
#projectName {display: inline-block; width: 32%;}
#productsBox a {border-radius: 2px !important;}
#productsBox .col-sm-4 {padding-right: 5px;}
#productsBox .required:after {right: -4.5px !important;}
#productsBox .required:after {right: -9.5px !important;}
#productsBox .addProduct {padding-left: 0px !important; padding-right: 10px;}
#productsBox .addProduct.required:after {right: -1px !important;}
#productsBox .input-group-addon > div {display: inline-block !important;}
#productsBox .required + .text-danger.help-text {position: relative; left: 10px;}
#productsBox > #productNameLabel {padding-top: 8px;}
#plansBox .row {display: inline-table; width: 102%;}
#plansBox .col-sm-4 {float: none; display: inline-block; padding-right: 5px;}
#dataform th {vertical-align: top; padding-top: 13px;}
module/project/js/create.js
+1 -1
View File
@@ -212,7 +212,7 @@ function addNewProduct(obj)
$('#productTitle').html(manageProducts);
}
$('#productsBox div + .text-danger.help-text').empty();
$('#productsBox div + .text-danger.help-text').remove();
}
/**
module/projectrelease/view/linkstory.html.php
+1 -1
View File
@@ -50,7 +50,7 @@
<td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri)?>'><?php echo zget($lang->story->priList, $story->pri)?></span></td>
<td class='text-left nobr c-name' title='<?php echo $story->title?>'>
<?php
if($story->parent > 0) echo "<span class='label'>{$lang->story->childrenAB}</span>";
if($story->parent > 0) echo "<span class='label label-badge label-light'>{$lang->story->childrenAB}</span>";
echo html::a($this->createLink('story', 'view', "storyID={$story->id}&version=0&param=$projectID", '', true), $story->title, '', "data-toggle='modal' data-type='iframe' data-width='90%'");
?>
</td>
module/projectrelease/view/view.html.php
+1 -1
View File
@@ -94,7 +94,7 @@
<td><span class='label-pri <?php echo 'label-pri-' . $story->pri;?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
<td class='text-left nobr' title='<?php echo $story->title?>'>
<?php
if($story->parent > 0) echo "<span class='label'>{$lang->story->childrenAB}</span>";
if($story->parent > 0) echo "<span class='label label-badge label-light'>{$lang->story->childrenAB}</span>";
echo html::a($storyLink,$story->title, '', "class='preview'");
?>
</td>
module/story/control.php
+8 -1
View File
@@ -1858,11 +1858,18 @@ class story extends control
$storyGroup = array();
foreach($stories as $story)
{
if(strpos('draft,reviewing,changing,closed', $story->status) !== false) continue;
if(strpos('draft,reviewing,changing,closed', $story->status) !== false)
{
unset($stories[$story->id]);
continue;
}
if(isset($storyGroup[$story->module])) continue;
$storyGroup[$story->module] = $this->story->getExecutionStoryPairs($executionID, 0, 'all', $story->module, 'short', 'active');
}
if(empty($stories)) return print(js::error($this->lang->story->noStoryToTask) . js::locate($this->session->storyList));
$this->view->title = $this->lang->story->batchToTask;
$this->view->executionID = $executionID;
$this->view->syncFields = empty($_POST['fields']) ? array() : $_POST['fields'];
module/story/lang/de.php
+1
View File
@@ -307,6 +307,7 @@ $lang->story->confirmChangePlan = $lang->SRCommon . ' %s is linked to the bra
$lang->story->errorDuplicateStory = $lang->SRCommon . '%s not exist';
$lang->story->confirmRecallChange = "After undo the change, the story content will revert to the version before the change. Are you sure you want to undo?";
$lang->story->confirmRecallReview = "Are you sure you want to withdraw the review?";
$lang->story->noStoryToTask = "Only the activated {$lang->SRCommon} can be converted into a task!";
$lang->story->form = new stdclass();
$lang->story->form->area = 'Story Bereich';
module/story/lang/en.php
+1
View File
@@ -307,6 +307,7 @@ $lang->story->confirmChangePlan = $lang->SRCommon . ' %s is linked to the bra
$lang->story->errorDuplicateStory = $lang->SRCommon . '%s not exist';
$lang->story->confirmRecallChange = "After undo the change, the story content will revert to the version before the change. Are you sure you want to undo?";
$lang->story->confirmRecallReview = "Are you sure you want to withdraw the review?";
$lang->story->noStoryToTask = "Only the activated {$lang->SRCommon} can be converted into a task!";
$lang->story->form = new stdclass();
$lang->story->form->area = 'Scope';
module/story/lang/fr.php
+1
View File
@@ -307,6 +307,7 @@ $lang->story->confirmChangePlan = $lang->SRCommon . ' %s is linked to the bra
$lang->story->errorDuplicateStory = $lang->SRCommon . '%s not exist';
$lang->story->confirmRecallChange = "After undo the change, the story content will revert to the version before the change. Are you sure you want to undo?";
$lang->story->confirmRecallReview = "Are you sure you want to withdraw the review?";
$lang->story->noStoryToTask = "Only the activated {$lang->SRCommon} can be converted into a task!";
$lang->story->form = new stdclass();
$lang->story->form->area = 'Périmètre';
module/story/lang/vi.php
+1
View File
@@ -299,6 +299,7 @@ $lang->story->confirmChangePlan = $lang->SRCommon . ' %s is linked to the bra
$lang->story->errorDuplicateStory = $lang->SRCommon . '%s not exist';
$lang->story->confirmRecallChange = "After undo the change, the story content will revert to the version before the change. Are you sure you want to undo?";
$lang->story->confirmRecallReview = "Are you sure you want to withdraw the review?";
$lang->story->noStoryToTask = "Only the activated {$lang->SRCommon} can be converted into a task!";
$lang->story->form = new stdclass();
$lang->story->form->area = 'Phạm vi';
module/story/lang/zh-cn.php
+1
View File
@@ -307,6 +307,7 @@ $lang->story->confirmChangePlan = $lang->SRCommon . '%s已关联在之前计
$lang->story->errorDuplicateStory = $lang->SRCommon . '%s不存在';
$lang->story->confirmRecallChange = "撤销变更后，需求内容会回退至变更前的版本，您确定要撤销吗？";
$lang->story->confirmRecallReview = "您确定要撤回评审吗？";
$lang->story->noStoryToTask = "只有激活的{$lang->SRCommon}才能转为任务！";
$lang->story->form = new stdclass();
$lang->story->form->area = "该{$lang->SRCommon}所属范围";
module/story/view/create.html.php
-3
View File
@@ -11,9 +11,6 @@
*/
?>
<?php include './header.html.php';?>
<style>
#product_chosen {border-right:1px solid #dcdcdc;}
</style>
<?php js::set('page', 'create');?>
<?php js::set('holders', $lang->story->placeholder); ?>
<?php js::set('blockID', $blockID); ?>
module/task/control.php
+1 -1
View File
@@ -230,7 +230,7 @@ class task extends control
elseif($this->post->after == 'toTaskList')
{
setcookie('moduleBrowseParam', 0, 0, $this->config->webRoot, '', $this->config->cookieSecure, false);
$taskLink = $this->createLink('execution', 'task', "executionID=$executionID&status=all&param=0&orderBy=id_desc");
$taskLink = $this->createLink('execution', 'task', "executionID=$executionID&status=unclosed&param=0&orderBy=id_desc");
$response['locate'] = $taskLink;
return $this->send($response);
}
module/task/js/create.js
+1 -1
View File
@@ -97,7 +97,7 @@ function loadExecutionMembers(executionID)
*/
function loadExecutionStories(executionID)
{
$.get(createLink('story', 'ajaxGetExecutionStories', 'executionID=' + executionID + '&productID=0&branch=0&moduleID=0&storyID=' + $('#story').val()), function(data)
$.get(createLink('story', 'ajaxGetExecutionStories', 'executionID=' + executionID + '&productID=0&branch=0&moduleID=0&storyID=' + $('#story').val() + '&number=&type=full&status=active'), function(data)
{
$('#story_chosen').remove();
$('#story').next('.picker').remove();
module/task/view/batchedit.html.php
+2 -2
View File
@@ -99,8 +99,8 @@ js::set('requiredFields', $config->task->edit->requiredFields);
$taskMembers = array();
if(isset($teams[$taskID]))
{
$teamAccounts = array_keys($teams[$taskID]);
foreach($teamAccounts as $teamAccount) $taskMembers[$teamAccount] = $users[$teamAccount];
$teamAccounts = $teams[$taskID];
foreach($teamAccounts as $teamAccount) $taskMembers[$teamAccount->account] = $users[$teamAccount->account];
}
else
{