diff --git a/config/filter.php b/config/filter.php index e680df15ff..ffd770a537 100644 --- a/config/filter.php +++ b/config/filter.php @@ -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'; diff --git a/module/productplan/control.php b/module/productplan/control.php index 7f1968b722..cfb3c5cdf7 100644 --- a/module/productplan/control.php +++ b/module/productplan/control.php @@ -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; diff --git a/module/productplan/js/browse.js b/module/productplan/js/browse.js index 9980360ed9..6314c2087e 100644 --- a/module/productplan/js/browse.js +++ b/module/productplan/js/browse.js @@ -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(); }); }); diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php index 04debcea73..1e64745b5d 100644 --- a/module/productplan/view/browse.html.php +++ b/module/productplan/view/browse.html.php @@ -18,7 +18,7 @@ productplan->enterProjectList);?> productplan->projectNotEmpty)?>