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

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

Browse Source
This commit is contained in:
hufangzhou
2020-12-17 09:27:10 +08:00
parent 27006dfc8e 9cc53ca106
commit 3c207004b1
5 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/lang/zh-cn.php
+6 -5
View File
@@ -90,8 +90,8 @@ $lang->action->objectTypes['todo'] = '待办';
$lang->action->objectTypes['risk'] = '风险';
$lang->action->objectTypes['issue'] = '问题';
$lang->action->objectTypes['module'] = '模块';
$lang->action->objecttypes['user'] = '用户';
$lang->action->objecttypes['stakeholder'] = '干系人';
$lang->action->objectTypes['user'] = '用户';
$lang->action->objectTypes['stakeholder'] = '干系人';
$lang->action->objectTypes['budget'] = '费用估算';
$lang->action->objectTypes['entry'] = '应用';
$lang->action->objectTypes['webhook'] = 'Webhook';
@@ -437,13 +437,14 @@ $lang->action->label->stakeholder = '干系人|stakeholder|view|userID=%s';
/* Object type. */
$lang->action->search->objectTypeList[''] = '';
$lang->action->search->objectTypeList['product'] = $lang->productCommon;
$lang->action->search->objectTypeList['program'] = '项目';
$lang->action->search->objectTypeList['project'] = $lang->projectCommon;
$lang->action->search->objectTypeList['program'] = '项目集';
$lang->action->search->objectTypeList['project'] = '项目';
$lang->action->search->objectTypeList['execution'] = '迭代/阶段';
$lang->action->search->objectTypeList['bug'] = 'Bug';
$lang->action->search->objectTypeList['case'] = '用例';
$lang->action->search->objectTypeList['caseresult'] = '用例结果';
$lang->action->search->objectTypeList['stepresult'] = '用例步骤';
$lang->action->search->objectTypeList['story'] = $lang->productSRCommon;
$lang->action->search->objectTypeList['story'] = '用需/软需';
$lang->action->search->objectTypeList['task'] = '任务';
$lang->action->search->objectTypeList['testtask'] = '测试单';
$lang->action->search->objectTypeList['user'] = '用户';
module/company/control.php
+12 -11
View File
@@ -245,17 +245,18 @@ class company extends control
$this->loadModel('search')->setSearchParams($this->config->company->dynamic->search);
/* Assign. */
$this->view->browseType = $browseType;
$this->view->account = $account;
$this->view->product = $product;
$this->view->project = $project;
$this->view->queryID = $queryID;
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
$this->view->user = $user;
$this->view->param = $param;
$this->view->dateGroups = $this->action->buildDateGroup($actions, $direction, $browseType);
$this->view->direction = $direction;
$this->view->browseType = $browseType;
$this->view->account = $account;
$this->view->accountPairs = $this->user->getPairs('noclosed|nodeleted|noletter');
$this->view->product = $product;
$this->view->project = $project;
$this->view->queryID = $queryID;
$this->view->orderBy = $orderBy;
$this->view->pager = $pager;
$this->view->user = $user;
$this->view->param = $param;
$this->view->dateGroups = $this->action->buildDateGroup($actions, $direction, $browseType);
$this->view->direction = $direction;
$this->display();
}
}
module/issue/control.php
+3 -7
View File
@@ -401,13 +401,9 @@ class issue extends control
case 'totask':
$this->loadModel('story');
$project = $this->project->getById($projectID);
$members = $this->project->getTeamMemberPairs($projectID, 'nodeleted');
$stories = $this->story->getProjectStoryPairs($projectID, 0, 0);
$this->view->project = $project;
$this->view->members = $members;
$this->view->stories = $stories;
$this->view->project = $this->project->getById($projectID);
$this->view->members = $this->project->getTeamMemberPairs($projectID, 'nodeleted');
$this->view->stories = $this->story->getProjectStoryPairs($projectID, 0, 0);
$this->view->showFields = $this->config->task->custom->createFields;
$this->display('issue', 'taskform');
module/issue/view/storyform.html.php
+3 -3
View File
@@ -48,7 +48,7 @@
<td colspan='2'>
<div class='input-group' id='planIdBox'>
<?php
echo html::select('plan', $plans, $planID, "class='form-control chosen'");
echo html::select('plan', $plans, 0, "class='form-control chosen'");
if(count($plans) == 1)
{
echo "<div class='input-group-btn'>";
@@ -66,9 +66,9 @@
<div class="input-group">
<div class="input-group">
<div class="input-group-addon"><?php echo $lang->story->source;?></div>
<?php echo html::select('source', $lang->story->sourceList, $source, "class='form-control chosen'");?>
<?php echo html::select('source', $lang->story->sourceList, 0, "class='form-control chosen'");?>
<span class='input-group-addon'><?php echo $lang->story->sourceNote;?></span>
<?php echo html::input('sourceNote', $sourceNote, "class='form-control' style='width:140px;'");?>
<?php echo html::input('sourceNote', '', "class='form-control' style='width:140px;'");?>
</div>
</div>
</td>
module/story/control.php
+1 -1
View File
@@ -1334,8 +1334,8 @@ class story extends control
/* Set menu. The projectstory module does not execute. */
if($this->app->rawModule == 'story')
{
$products = $this->product->getPairs();
$this->lang->product->menu = $this->lang->product->viewMenu;
$products = $this->product->getPairs();
$productID = $this->product->saveState($productID, $products);
$this->lang->product->switcherMenu = $this->product->getSwitcher($productID, '', $branch);
$this->product->setMenu($products, $productID, $branch);