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

* fix bug.

Browse Source
This commit is contained in:
wangyidong
2021-03-17 09:21:26 +08:00
parent 32b1b95f24
commit e43b1fd89e
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update15.0.sql
+1
View File
@@ -30,6 +30,7 @@ ALTER TABLE `zt_burn` CHANGE `project` `execution` mediumint(8) unsigned NOT NUL
ALTER TABLE `zt_doc` CHANGE `project` `execution` mediumint(8) unsigned NOT NULL;
ALTER TABLE `zt_relation` CHANGE `project` `execution` mediumint(8) unsigned NOT NULL;
ALTER TABLE `zt_relation` CHANGE `program` `project` mediumint(8) unsigned NOT NULL;
ALTER TABLE `zt_case` CHANGE `project` `execution` mediumint(8) unsigned NOT NULL;
ALTER TABLE `zt_doclib` CHANGE `project` `execution` mediumint(8) unsigned NOT NULL;
ALTER TABLE `zt_task` CHANGE `project` `execution` mediumint(8) unsigned NOT NULL;
ALTER TABLE `zt_testreport` CHANGE `project` `execution` mediumint(8) unsigned NOT NULL;
db/zentao.sql
+1
View File
@@ -185,6 +185,7 @@ CREATE TABLE IF NOT EXISTS `zt_case` (
`id` mediumint(8) unsigned NOT NULL auto_increment,
`project` mediumint(8) unsigned NOT NULL,
`product` mediumint(8) unsigned NOT NULL default '0',
`execution` mediumint(8) unsigned NOT NULL,
`branch` mediumint(8) unsigned NOT NULL default '0',
`lib` mediumint(8) unsigned NOT NULL default '0',
`module` mediumint(8) unsigned NOT NULL default '0',
module/block/view/projectblock.html.php
+1 -3
View File
@@ -24,9 +24,7 @@
</thead>
<tbody>
<?php foreach($projects as $project):?>
<?php
$viewLink = $this->createLink('program', 'index', "programID={$project->id}");
?>
<?php $viewLink = $this->createLink('project', 'index', "programID={$project->id}");?>
<tr>
<td title='<?php echo $project->name?>'><?php echo html::a($viewLink, $project->name);?></td>
<td><?php echo zget($users, $project->PM, $project->PM)?></td>
module/execution/control.php
+2 -2
View File
@@ -476,7 +476,7 @@ class execution extends control
$toExecution = $execution->id;
$branches = $this->execution->getBranches($toExecution);
$tasks = $this->execution->getTasks2Imported($toExecution, $branches);
$executions = $this->execution->getsToImport(array_keys($tasks), $execution->type);
$executions = $this->execution->getToImport(array_keys($tasks), $execution->type);
unset($executions[$toExecution]);
unset($tasks[$toExecution]);
@@ -1984,7 +1984,7 @@ class execution extends control
$this->execution->setMenu($this->executions, $executionID);
$execution = $this->loadModel('execution')->getById($executionID);
$stories = $this->loadModel('story')->getStories($executionID);
$stories = $this->loadModel('story')->getExecutionStories($executionID);
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'story', false);
/* Get execution's product. */
module/execution/js/importtask.js
+2 -2
View File
@@ -1,5 +1,5 @@
function reload(toProject, fromProject)
{
link = createLink('project','importtask','toProject='+toProject + '&fromProject='+fromProject);
{
link = createLink('execution','importtask','toProject='+toProject + '&fromProject='+fromProject);
location.href = link;
}
module/execution/model.php
+1 -1
View File
@@ -1733,7 +1733,7 @@ class executionModel extends model
$executions = $this->dao->select('t1.product, t1.project')->from(TABLE_PROJECTPRODUCT)->alias('t1')
->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.project=t2.id')
->where('t1.product')->in(array_keys($products))
->andWhere('t2.project')->eq($execution->execution)
->andWhere('t2.project')->eq($execution->project)
->fetchGroup('execution');
$branches = str_replace(',', "','", $branches);