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

Merge branch 'sprint/tianshujie_bug' into 'master'

Browse Source 
Sprint/tianshujie bug

See merge request easycorp/zentaopms!5299
This commit is contained in:
王怡栋
2022-09-09 03:24:09 +00:00
parent 1bb552b34d e9efb56769
commit eeaad02185
8 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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/doc/css/createbasicinfo.css
+1
View File
@@ -1 +1,2 @@
#whiteListBox .input-group:last-child {margin-top: 10px;}
#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/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();