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

* fix bug for waring.

Browse Source
This commit is contained in:
wyd621
2013-08-02 10:15:02 +08:00
parent 48ba3c94c6
commit 767c135303
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/control.php
+2 -2
View File
@@ -351,7 +351,7 @@ class common extends control
if(isset($preAndNext->pre) and $preAndNext->pre)
{
$id = (!$_SESSION[$typeOnlyCondition] and $app->getModuleName() == 'testcase' and isset($preAndNext->pre->case)) ? 'case' : 'id';
$id = (isset($_SESSION['testcaseOnlyCondition']) and !$_SESSION['testcaseOnlyCondition'] and $app->getModuleName() == 'testcase' and isset($preAndNext->pre->case)) ? 'case' : 'id';
$title = isset($preAndNext->pre->title) ? $preAndNext->pre->title : $preAndNext->pre->name;
$title = '#' . $preAndNext->pre->$id . ' ' . $title;
echo "<span class='link-button'>";
@@ -360,7 +360,7 @@ class common extends control
}
if(isset($preAndNext->next) and $preAndNext->next)
{
$id = (!$_SESSION[$typeOnlyCondition] and $app->getModuleName() == 'testcase' and isset($preAndNext->next->case)) ? 'case' : 'id';
$id = (isset($_SESSION['testcaseOnlyCondition']) and !$_SESSION['testcaseOnlyCondition'] and $app->getModuleName() == 'testcase' and isset($preAndNext->next->case)) ? 'case' : 'id';
$title = isset($preAndNext->next->title) ? $preAndNext->next->title : $preAndNext->next->name;
$title = '#' . $preAndNext->next->$id . ' ' . $title;
echo "<span class='link-button'>";
module/project/control.php
+2 -1
View File
@@ -147,7 +147,6 @@ class project extends control
{
$modules = $this->tree->getProjectModule($projectID, $productID);
$tasks = $this->loadModel('task')->getTasksByModule($projectID, $modules, $orderBy, $pager);
$this->view->productID = $productID;
}
elseif($status == 'byModule')
{
@@ -213,6 +212,7 @@ class project extends control
$this->view->param = $param;
$this->view->projectID = $projectID;
$this->view->project = $project;
$this->view->productID = $productID;
$this->view->moduleID = $moduleID;
$this->view->moduleTree = $this->tree->getTaskTreeMenu($projectID, $productID = 0, $startModuleID = 0, array('treeModel', 'createTaskLink'));
$this->view->projectTree = $this->project->tree();
@@ -504,6 +504,7 @@ class project extends control
$this->loadModel('story');
$this->loadModel('user');
$this->loadModel('task');
$this->app->loadLang('testcase');
/* Save session. */
$this->app->session->set('storyList', $this->app->getURI(true));
module/project/view/doc.html.php
+1 -1
View File
@@ -37,7 +37,7 @@
?>
<tr class='a-center'>
<td><?php if($canView) echo html::a($viewLink, sprintf('%03d', $doc->id)); else printf('%03d', $doc->id);?></td>
<td><?php @print($modules[$doc->module]);?></td>
<td><?php if(isset($modules[$doc->module]))print($modules[$doc->module]);?></td>
<td class='a-left nobr'><nobr><?php echo html::a($viewLink, $doc->title);?></nobr></td>
<td><?php echo $users[$doc->addedBy];?></td>
<td><?php echo $doc->addedDate;?></td>
module/story/view/view.html.php
+3 -2
View File
@@ -194,12 +194,13 @@
<table class='table-1 fixed'>
<tr>
<td>
<?php
<?php
foreach($story->tasks as $projectTasks)
{
foreach($projectTasks as $task)
{
@$projectName = $projects[$task->project];
if(!isset($projects[$task->project])) continue;
$projectName = $projects[$task->project];
echo html::a($this->createLink('project', 'browse', "projectID=$task->project"), $projectName);
echo "<span title='$task->name'>" . html::a($this->createLink('task', 'view', "taskID=$task->id"), "#$task->id $task->name") . '</span><br />';
}