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

* Change the variable name.

Browse Source
This commit is contained in:
tianshujie98
2021-01-21 16:37:39 +08:00
parent aefd5fab9e
commit f22f4ebf39
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/control.php
+14 -14
View File
@@ -2215,7 +2215,7 @@ class project extends control
$allStories = $this->story->getProductStories(array_keys($products), $branches, $moduleID = '0', $status = 'active', 'story', 'id_desc', $hasParent = false, '', $pager = null);
}
if($project->project != 0) $stories = $this->story->getProjectStoryPairs($project->project);
if($project->project != 0) $projectStories = $this->story->getProjectStoryPairs($project->project);
$prjStories = $this->story->getProjectStoryPairs($projectID);
foreach($allStories as $id => $story)
@@ -2223,7 +2223,7 @@ class project extends control
if(isset($prjStories[$story->id])) unset($allStories[$id]);
if($story->parent < 0) unset($allStories[$id]);
if(!empty($stories) and !isset($stories[$story->id])) unset($allStories[$id]);
if(!empty($projectStories) and !isset($projectStories[$story->id])) unset($allStories[$id]);
}
/* Pager. */
@@ -2237,18 +2237,18 @@ class project extends control
$position[] = html::a($browseLink, $project->name);
$position[] = $this->lang->project->linkStory;
$this->view->title = $title;
$this->view->position = $position;
$this->view->project = $project;
$this->view->products = $products;
$this->view->stories = empty($stories) ? '' : $stories;
$this->view->allStories = empty($allStories) ? $allStories : $allStories[$pageID - 1];;
$this->view->pager = $pager;
$this->view->browseType = $browseType;
$this->view->productType = $productType;
$this->view->modules = $modules;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->branchGroups = $branchGroups;
$this->view->title = $title;
$this->view->position = $position;
$this->view->project = $project;
$this->view->products = $products;
$this->view->projectStories = empty($projectStories) ? '' : $projectStories;
$this->view->allStories = empty($allStories) ? $allStories : $allStories[$pageID - 1];;
$this->view->pager = $pager;
$this->view->browseType = $browseType;
$this->view->productType = $productType;
$this->view->modules = $modules;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->branchGroups = $branchGroups;
$this->display();
}
module/project/view/linkstory.html.php
+1 -1
View File
@@ -18,7 +18,7 @@
<div id="mainMenu" class="clearfix">
<div class="btn-toolbar pull-left">
<span class='btn btn-link btn-active-text'><span class='text'><?php echo $lang->project->linkStory;?></span></span>
<?php if($stories and ($this->app->rawModule == 'project')):?>
<?php if($projectStories and ($this->app->rawModule == 'project')):?>
<span class='btn btn-link'><span class='text'><?php echo $lang->project->linkPRJStoryTip;?></span></span>
<?php elseif($this->app->rawModule == 'project'):?>
<span class='btn btn-link'><span class='text'><?php echo $lang->project->linkAllStoryTip;?></span></span>