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

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
z
2020-08-11 08:05:56 +08:00
parent 73f5ccac58 7edd4ee1d7
commit c2ff9f6ef7
16 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/model.php
+4 -4
View File
@@ -338,7 +338,7 @@ class docModel extends model
->andWhere('addedBy')->eq($this->app->user->account)
->orderBy($sort)
->page($pager)
->fetchAll();
->fetchAll('id');
}
elseif($browseType == 'byediteddate')
{
@@ -365,7 +365,7 @@ class docModel extends model
->andWhere('collector')->like("%,{$this->app->user->account},%")
->orderBy($sort)
->page($pager)
->fetchAll();
->fetchAll('id');
}
elseif($browseType == "bymodule")
{
@@ -422,7 +422,7 @@ class docModel extends model
->andWhere('lib')->in($allLibs)
->orderBy($sort)
->page($pager)
->fetchAll();
->fetchAll('id');
}
elseif($browseType == 'fastsearch')
{
@@ -440,7 +440,7 @@ class docModel extends model
->andWhere('t1.lib')->in($allLibs)
->orderBy($sort)
->page($pager)
->fetchAll();
->fetchAll('id');
foreach($docs as $doc) $doc->title = str_replace($this->session->searchDoc, "<span style='color:red'>{$this->session->searchDoc}</span>", $doc->title);
}
module/doc/view/showfiles.html.php
+1
View File
@@ -36,6 +36,7 @@
echo html::hidden('pageID', isset($this->get->pageID) ? $this->get->pageID : 0);
}
?>
<?php echo html::hidden('onlybody', isonlybody() ? 'yes' : 'no');?>
<?php echo html::input('title', $this->get->title, "class='form-control' placeholder='{$lang->doc->fileTitle}'");?>
<?php echo html::submitButton("<i class='icon icon-search'></i>", '', "btn btn-icon btn-link input-control-icon-right");?>
</form>
module/project/control.php
+2
View File
@@ -1649,6 +1649,8 @@ class project extends control
$this->app->session->set('taskList', $uri);
$this->app->session->set('storyList', $uri);
$this->app->session->set('projectList', $uri);
$this->app->session->set('caseList', $uri);
$this->app->session->set('bugList', $uri);
if($type === 'json') die(helper::jsonEncode4Parse($tree, JSON_HEX_QUOT | JSON_HEX_APOS));
module/story/model.php
+1 -1
View File
@@ -2917,7 +2917,7 @@ class storyModel extends model
echo $story->estimate;
break;
case 'stage':
if(isset($storyStages[$story->id]))
if(isset($storyStages[$story->id]) and !empty($branches))
{
echo "<div class='dropdown dropdown-hover'>";
echo $this->lang->story->stageList[$story->stage];
module/story/view/batchcreate.html.php
+1 -1
View File
@@ -15,7 +15,7 @@
<div class="main-header">
<h2><?php echo $storyID ? $this->lang->story->subdivide : $this->lang->story->batchCreate;?></h2>
<div class="pull-right btn-toolbar">
<?php if(common::hasPriv('file', 'uploadImages')) echo html::a($this->createLink('file', 'uploadImages', 'module=story&params=' . helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID")), $lang->uploadImages, '', "data-toggle='modal' data-type='iframe' class='btn btn-primary' data-width='70%'")?>
<?php if(common::hasPriv('file', 'uploadImages')) echo html::a($this->createLink('file', 'uploadImages', 'module=story&params=' . helper::safe64Encode("productID=$productID&branch=$branch&moduleID=$moduleID&storyID=$storyID")), $lang->uploadImages, '', "data-toggle='modal' data-type='iframe' class='btn btn-primary' data-width='70%'")?>
<button type='button' data-toggle='modal' data-target="#importLinesModal" class="btn btn-primary"><?php echo $lang->pasteText;?></button>
<?php $customLink = $this->createLink('custom', 'ajaxSaveCustomFields', 'module=story&section=custom&key=batchCreateFields')?>
<?php include '../../common/view/customfield.html.php';?>
module/task/lang/de.php
+3
View File
@@ -298,3 +298,6 @@ $lang->task->report->tasksPerClosedReason->graph->xAxisName = 'Grund';
$lang->task->report->finishedTasksPerDay->type = 'bar';
$lang->task->report->finishedTasksPerDay->graph->xAxisName = 'Datum';
$lang->taskestimate = new stdclass();
$lang->taskestimate->consumed = 'Schätzung';
module/task/lang/en.php
+3
View File
@@ -298,3 +298,6 @@ $lang->task->report->tasksPerClosedReason->graph->xAxisName = 'Close Reason';
$lang->task->report->finishedTasksPerDay->type = 'bar';
$lang->task->report->finishedTasksPerDay->graph->xAxisName = 'Date';
$lang->taskestimate = new stdclass();
$lang->taskestimate->consumed = 'Estimates';
module/task/lang/fr.php
+3
View File
@@ -298,3 +298,6 @@ $lang->task->report->tasksPerClosedReason->graph->xAxisName = 'Raison Fermeture'
$lang->task->report->finishedTasksPerDay->type = 'bar';
$lang->task->report->finishedTasksPerDay->graph->xAxisName = 'Date';
$lang->taskestimate = new stdclass();
$lang->taskestimate->consumed = 'Estimés';
module/task/lang/vi.php
+3
View File
@@ -298,3 +298,6 @@ $lang->task->report->tasksPerClosedReason->graph->xAxisName = 'Lý do đóng';
$lang->task->report->finishedTasksPerDay->type = 'bar';
$lang->task->report->finishedTasksPerDay->graph->xAxisName = 'Ngày';
$lang->taskestimate = new stdclass();
$lang->taskestimate->consumed = 'Dự tính';
module/task/lang/zh-cn.php
+3
View File
@@ -298,3 +298,6 @@ $lang->task->report->tasksPerClosedReason->graph->xAxisName = '关闭原因';
$lang->task->report->finishedTasksPerDay->type = 'bar';
$lang->task->report->finishedTasksPerDay->graph->xAxisName = '日期';
$lang->taskestimate = new stdclass();
$lang->taskestimate->consumed = '工时';
module/task/lang/zh-tw.php
+3
View File
@@ -298,3 +298,6 @@ $lang->task->report->tasksPerClosedReason->graph->xAxisName = '關閉原因';
$lang->task->report->finishedTasksPerDay->type = 'bar';
$lang->task->report->finishedTasksPerDay->graph->xAxisName = '日期';
$lang->taskestimate = new stdclass();
$lang->taskestimate->consumed = '工時';
module/testtask/lang/de.php
+1
View File
@@ -15,6 +15,7 @@ $lang->testtask->reportChart = 'Bericht';
$lang->testtask->reportAction = 'Case Report';
$lang->testtask->delete = "Löschen";
$lang->testtask->importUnitResult = "Import Unit Result";
$lang->testtask->importunitresult = "Import Unit Result"; //Fix bug custom required testtask.
$lang->testtask->browseUnits = "Unit Test List";
$lang->testtask->unitCases = "Unit Test Cases";
$lang->testtask->view = "Übersicht";
module/testtask/lang/en.php
+1
View File
@@ -15,6 +15,7 @@ $lang->testtask->reportChart = 'Report';
$lang->testtask->reportAction = 'Case Report';
$lang->testtask->delete = "Delete Request";
$lang->testtask->importUnitResult = "Import Unit Result";
$lang->testtask->importunitresult = "Import Unit Result"; //Fix bug custom required testtask.
$lang->testtask->browseUnits = "Unit Test List";
$lang->testtask->unitCases = "Unit Test Cases";
$lang->testtask->view = "Request Detail";
module/testtask/lang/fr.php
+1
View File
@@ -15,6 +15,7 @@ $lang->testtask->reportChart = 'Rapport';
$lang->testtask->reportAction = 'Rapport CasTests';
$lang->testtask->delete = "Supprimer Campagne";
$lang->testtask->importUnitResult = "Import T.U. Résult";
$lang->testtask->importunitresult = "Import T.U. Résult"; //Fix bug custom required testtask.
$lang->testtask->browseUnits = "Liste des tests unitaires";
$lang->testtask->unitCases = "Cas de test unitaires";
$lang->testtask->view = "Détail Campagne";
module/testtask/lang/vi.php
+1
View File
@@ -15,6 +15,7 @@ $lang->testtask->reportChart = 'Báo cáo';
$lang->testtask->reportAction = 'Báo cáo tình huống';
$lang->testtask->delete = "Xóa yêu cầu";
$lang->testtask->importUnitResult = "Import Unit Result";
$lang->testtask->importunitresult = "Import Unit Result"; //Fix bug custom required testtask.
$lang->testtask->browseUnits = "Unit Test List";
$lang->testtask->unitCases = "Unit Test Cases";
$lang->testtask->view = "Chi tiết yêu cầu";
module/testtask/lang/zh-cn.php
+1
View File
@@ -15,6 +15,7 @@ $lang->testtask->reportChart = '报表统计';
$lang->testtask->reportAction = '用例报表统计';
$lang->testtask->delete = "删除测试单";
$lang->testtask->importUnitResult = "导入单元测试结果";
$lang->testtask->importunitresult = "导入单元测试"; //Fix bug custom required testtask.
$lang->testtask->browseUnits = "单元测试列表";
$lang->testtask->unitCases = "单元测试用例";
$lang->testtask->view = "概况";