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

add param of currentProgram

Browse Source
This commit is contained in:
zhaohaibo
2020-05-27 14:34:57 +08:00
parent 53df7402db
commit 0fb4b5ce32
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/control.php
+1 -1
View File
@@ -102,7 +102,7 @@ class product extends control
* @return void
*/
public function browse($productID = 0, $branch = '', $browseType = 'unclosed', $param = 0, $storyType = 'story', $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1)
{die();
{
/* Lower browse type. */
$browseType = strtolower($browseType);
module/product/view/roadmap.html.php
+2 -2
View File
@@ -42,7 +42,7 @@
<p>
<span class="text-muted"><?php echo $lang->release->noRelease;?></span>
<?php if(common::hasPriv('release', 'create')):?>
<?php echo html::a($this->createLink('release', 'create', "productID=$product->id&branch=$branchKey"), "<i class='icon icon-plus'></i> " . $lang->release->create, '', "class='btn btn-info'");?>
<?php echo html::a($this->createLink('release', 'create', "productID=$product->id&branch=$branchKey", '', '', $this->session->program), "<i class='icon icon-plus'></i> " . $lang->release->create, '', "class='btn btn-info'");?>
<?php endif;?>
</p>
</div>
@@ -60,7 +60,7 @@
<ul class="release-line">
<?php foreach($roadmapData as $roadmap):?>
<li <?php if(isset($roadmap->build) && date('Y-m-d') < $roadmap->date) echo "class='active'";?>>
<?php $viewLink = isset($roadmap->build) ? $this->createLink('release', 'view', "releaseID=$roadmap->id") : $this->createLink('productplan', 'view', "planID=$roadmap->id");?>
<?php $viewLink = isset($roadmap->build) ? $this->createLink('release', 'view', "releaseID=$roadmap->id", '', '', $this->session->program) : $this->createLink('productplan', 'view', "planID=$roadmap->id", '', '', $this->session->program);?>
<a href="<?php echo $viewLink;?>">
<?php if(!empty($roadmap->marker)):?>
<i class="icon icon-flag text-primary"></i>
module/project/control.php
+8 -8
View File
@@ -24,8 +24,8 @@ class project extends control
if($this->methodName != 'computeburn')
{
$this->projects = $this->project->getPairs('nocode');
if(!$this->projects and $this->methodName != 'index' and $this->methodName != 'create' and $this->app->getViewType() != 'mhtml') $this->locate($this->createLink('project', 'create'));
if(!$this->projects and $this->methodName != 'index' and $this->methodName != 'create' and $this->app->getViewType() == 'mhtml') $this->locate($this->createLink('project', 'index'));
if(!$this->projects and $this->methodName != 'index' and $this->methodName != 'create' and $this->app->getViewType() != 'mhtml') $this->locate($this->createLink('project', 'create', '', '', '', $this->session->program));
if(!$this->projects and $this->methodName != 'index' and $this->methodName != 'create' and $this->app->getViewType() == 'mhtml') $this->locate($this->createLink('project', 'index', '', '', '', $this->session->program));
}
}
@@ -40,12 +40,12 @@ class project extends control
*/
public function index($locate = 'auto', $projectID = 0)
{
if($locate == 'yes') $this->locate($this->createLink('project', 'task'));
if($locate == 'yes') $this->locate($this->createLink('project', 'task', '', '', '', $this->session->program));
if($this->app->viewType != 'mhtml') unset($this->lang->project->menu->index);
$this->commonAction($projectID);
if(common::hasPriv('program', 'createguide')) $this->lang->modulePageActions = html::a($this->createLink('project', 'createguide'), "<i class='icon icon-sm icon-plus'></i> " . $this->lang->project->create, '', "class='btn btn-primary' data-toggle='modal' data-type='ajax'");
if(common::hasPriv('program', 'createguide')) $this->lang->modulePageActions = html::a($this->createLink('project', 'createguide', '', '', '', $this->session->program), "<i class='icon icon-sm icon-plus'></i> " . $this->lang->project->create, '', "class='btn btn-primary' data-toggle='modal' data-type='ajax'");
$this->view->title = $this->lang->project->index;
$this->view->position[] = $this->lang->project->index;
@@ -62,7 +62,7 @@ class project extends control
*/
public function browse($projectID = 0)
{
$this->locate($this->createLink($this->moduleName, 'task', "projectID=$projectID"));
$this->locate($this->createLink($this->moduleName, 'task', "projectID=$projectID", '', '', $this->session->program));
}
/**
@@ -169,7 +169,7 @@ class project extends control
/* Header and position. */
$this->view->title = $project->name . $this->lang->colon . $this->lang->project->task;
$this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name);
$this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID", '', '', $this->session->program), $project->name);
$this->view->position[] = $this->lang->project->task;
/* Load pager and get tasks. */
@@ -181,7 +181,7 @@ class project extends control
$tasks = $this->project->getTasks($productID, $projectID, $this->projects, $browseType, $queryID, $moduleID, $sort, $pager);
/* Build the search form. */
$actionURL = $this->createLink('project', 'task', "projectID=$projectID&status=bySearch&param=myQueryID");
$actionURL = $this->createLink('project', 'task', "projectID=$projectID&status=bySearch&param=myQueryID", '', '', $this->session->program);
$this->config->project->search['onMenuBar'] = 'yes';
$this->project->buildTaskSearchForm($projectID, $this->projects, $queryID, $actionURL);
@@ -238,7 +238,7 @@ class project extends control
/* Header and session. */
$this->view->title = $project->name . $this->lang->colon . $this->lang->project->task;
$this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name);
$this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID", '', '', $this->session->program), $project->name);
$this->view->position[] = $this->lang->project->task;
/* Get tasks and group them. */