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

* Modify variable name.

Browse Source
This commit is contained in:
tianshujie
2021-12-27 17:20:47 +08:00
parent 27319feba9
commit 593cabd96c
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/filter.php
View File

@@ -270,7 +270,7 @@ $filter->story->export->cookie['checkedItem'] = 'reg::checked';
$filter->story->track->cookie['preBranch'] = 'reg::word';
$filter->story->track->cookie['preProductID'] = 'int';
$filter->productplan->browse->cookie['planType'] = 'code';
$filter->productplan->browse->cookie['viewType'] = 'code';
$filter->task->create->cookie['lastTaskModule'] = 'int';
$filter->task->export->cookie['checkedItem'] = 'reg::checked';

6
module/productplan/control.php
View File

@@ -246,12 +246,12 @@ class productplan extends control
$sort = $this->loadModel('common')->appendOrder($orderBy);
$this->session->set('productPlanList', $this->app->getURI(true), 'product');
$planType = $this->cookie->planType ? $this->cookie->planType : 'bylist';
$viewType = $this->cookie->viewType ? $this->cookie->viewType : 'bylist';
$this->commonAction($productID, $branch);
$product = $this->product->getById($productID);
$productName = empty($product) ? '' : $product->name;
if($product->type != 'normal' and $planType == 'bykanban')
if($product->type != 'normal' and $viewType == 'bykanban')
{
$this->view->branches = array('all' => $this->lang->productplan->allAB) + $this->loadModel('branch')->getPairs($productID);
}
@@ -261,7 +261,7 @@ class productplan extends control
$this->view->productID = $productID;
$this->view->branch = $branch;
$this->view->browseType = $browseType;
$this->view->planType = $planType;
$this->view->viewType = $viewType;
$this->view->orderBy = $orderBy;
$this->view->plans = $this->productplan->getList($productID, $branch, $browseType, $pager, $sort);
$this->view->pager = $pager;

4
module/productplan/js/browse.js
View File

@@ -39,8 +39,8 @@ $(function()
$('[id="switchButton"]').click(function()
{
var planType = $(this).attr('data-type');
$.cookie('planType', planType, {expires:config.cookieLife, path:config.webRoot});
var viewType = $(this).attr('data-type');
$.cookie('viewType', viewType, {expires:config.cookieLife, path:config.webRoot});
window.location.reload();
});
});

2
module/productplan/view/browse.html.php
View File

@@ -18,7 +18,7 @@
<?php js::set('enterProjectList', $lang->productplan->enterProjectList);?>
<?php js::set('projectNotEmpty', $lang->productplan->projectNotEmpty)?>
<?php
if($planType == 'bykanban')
if($viewType == 'bykanban')
{
include 'browsebykanban.html.php';
}