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:
wangyidong
2017-05-02 11:17:27 +08:00
parent 53653b0572 c4b150c4be
commit 99fbbbe92a
13 changed files with 95 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/js/common.js
+1 -1
View File
@@ -9,7 +9,7 @@ $(function()
moduleID = $('#module').val();
assignedto = $('#assignedTo').val();
changeProductConfirmed = true;
oldStoryID = 0;
oldStoryID = $('#story').val() || 0;
oldProjectID = 0;
oldOpenedBuild = '';
oldTaskID = 0;
module/custom/control.php
+13
View File
@@ -185,6 +185,19 @@ class custom extends control
$this->display();
}
public function working()
{
if($_POST)
{
$this->loadModel('setting')->setItem('system.custom.working', $this->post->working);
die(js::reload('parent'));
}
$this->view->title = $this->lang->custom->working;
$this->view->position[] = $this->lang->custom->working;
$this->display();
}
/**
* Ajax save custom fields.
*
module/custom/lang/en.php
+6
View File
@@ -6,6 +6,7 @@ $lang->custom->restore = 'Reset to Default';
$lang->custom->key = 'Key';
$lang->custom->value = 'Value';
$lang->custom->flow = 'Process';
$lang->custom->working = 'Working';
$lang->custom->select = 'Select Process';
$lang->custom->branch = 'Multi Branch';
@@ -100,5 +101,10 @@ $lang->custom->productProject->relation['1_1'] = 'Project - Sprint';
$lang->custom->productProject->notice = 'Please select according to your team.';
$lang->custom->workingList['complete'] = 'Complete';
$lang->custom->workingList['test'] = 'Test';
$lang->custom->workingList['story'] = 'Story';
$lang->custom->workingList['task'] = 'Task';
$lang->custom->menuTip = 'Click to show/hide navigation bar. Drag to swtich display order.';
$lang->custom->saveFail = 'Failed to save!';
module/custom/lang/zh-cn.php
+6
View File
@@ -6,6 +6,7 @@ $lang->custom->restore = '恢复默认';
$lang->custom->key = '键';
$lang->custom->value = '值';
$lang->custom->flow = '流程';
$lang->custom->working = '工作方式';
$lang->custom->select = '请选择流程：';
$lang->custom->branch = '多分支';
@@ -100,5 +101,10 @@ $lang->custom->productProject->relation['1_1'] = '项目 - 迭代';
$lang->custom->productProject->notice = '请根据实际情况选择适合自己团队的概念。';
$lang->custom->workingList['complete'] = '完整研发管理工具';
$lang->custom->workingList['test'] = '测试管理工具';
$lang->custom->workingList['story'] = '需求管理工具';
$lang->custom->workingList['task'] = '任务管理工具';
$lang->custom->menuTip = '点击显示或隐藏导航条目，拖拽来更改显示顺序。';
$lang->custom->saveFail = '保存失败！';
module/custom/view/flow.html.php
+2
View File
@@ -22,6 +22,8 @@
}
echo "<li class='active'>";
common::printLink('custom', 'flow', "", $lang->custom->flow);
echo '</li><li>';
common::printLink('custom', 'working', '', $lang->custom->working);
echo '</li>';
?>
</ul>
module/custom/view/set.html.php
+2
View File
@@ -42,6 +42,8 @@ EOT;
}
echo '<li>';
common::printLink('custom', 'flow', "", $lang->custom->flow);
echo '</li><li>';
common::printLink('custom', 'working', '', $lang->custom->working);
echo '</li>';
?>
</ul>
module/custom/view/working.html.php
+42
View File
@@ -0,0 +1,42 @@
<?php
/**
* The set view file of custom module of ZenTaoPMS.
*
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Tingting Dai <daitingting@xirangit.com>
* @package custom
* @version $Id$
* @link http://www.zentao.net
*/
?>
<?php include '../../common/view/header.html.php';?>
<div id='featurebar'>
<ul class='nav'>
<?php
foreach($lang->custom->object as $object => $name)
{
echo "<li id='{$object}Tab'>";
common::printLink('custom', 'set', "module=$object", $name);
echo '</li>';
}
echo '<li>';
common::printLink('custom', 'flow', "", $lang->custom->flow);
echo "</li><li class='active'>";
common::printLink('custom', 'working', '', $lang->custom->working);
echo '</li>';
?>
</ul>
</div>
<div class='main'>
<form method='post' class='form-condensed' target='hiddenwin'>
<table class='table table-form'>
<tr>
<th class='w-100px text-top'><?php echo $lang->custom->working;?></th>
<td><?php echo html::radio('working', $lang->custom->workingList, isset($config->custom->working) ? $config->custom->working : 'complete', '', 'block');?></td>
</tr>
<tr><td></td><td><?php echo html::submitButton()?></td></tr>
</table>
</form>
</div>
<?php include '../../common/view/footer.html.php';?>
module/story/model.php
+1
View File
@@ -1308,6 +1308,7 @@ class storyModel extends model
*/
public function getProductStoryPairs($productID = 0, $branch = 0, $moduleIdList = 0, $status = 'all', $order = 'id_desc', $limit = 0)
{
if($branch) $branch = "0,$branch";//Fix bug 1059.
$stories = $this->dao->select('t1.id, t1.title, t1.module, t1.pri, t1.estimate, t2.name AS product')
->from(TABLE_STORY)->alias('t1')->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product = t2.id')
->where('1=1')
module/testtask/control.php
+2 -3
View File
@@ -919,10 +919,9 @@ class testtask extends control
$results = $this->testtask->getResults($runID);
$testtaskID = $this->dao->select('task')->from(TABLE_TESTRUN)->where('id')->eq($runID)->fetch('task');
$testtask = $this->dao->select('build, product')->from(TABLE_TESTTASK)->where('id')->eq($testtaskID)->fetch();
$testtask = $this->dao->select('build, project, product')->from(TABLE_TESTTASK)->where('id')->eq($testtaskID)->fetch();
$this->view->build = isset($builds[$testtask->build]) ? $builds[$testtask->build] : '';
$this->view->testtaskID = $testtaskID;
$this->view->testtask = $testtask;
}
else
{
module/testtask/view/results.html.php
+2 -1
View File
@@ -47,9 +47,10 @@
<td class='w-60px'><?php if(!empty($result->files)) echo html::a("#caseResult{$result->id}", $lang->files . $fileCount, '', "data-toggle='modal' data-type='iframe'")?></td>
<td class='w-50px text-center'><i class='collapse-handle icon-chevron-down text-muted'></i></td>
</tr>
<?php $params = isset($testtask) ? "testtask=$testtask->id,projectID=$testtask->project,buildID=$testtask->build" : '';?>
<tr class='result-detail hide' id='tr-detail_<?php echo $trCount++; ?>'>
<td colspan='7' class='pd-0'>
<form action='<?php echo $this->createLink('bug', 'create', "product=$case->product&branch=$case->branch&extras=caseID=$case->id,version=$case->version,resultID=$result->id,runID=$runID" . (isset($testtaskID) ? ",testtask=$testtaskID" : ''))?>' target='_blank' method='post'>
<form action='<?php echo $this->createLink('bug', 'create', "product=$case->product&branch=$case->branch&extras=caseID=$case->id,version=$case->version,resultID=$result->id,runID=$runID" . $params)?>' target='_blank' method='post'>
<table class='table table-condensed borderless mg-0 resultSteps'>
<thead>
<tr>