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

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2017-08-22 13:44:49 +08:00
parent 34b794e39a e1005f67c5
commit b0c67d90bb
4 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/control.php
+11 -10
View File
@@ -99,14 +99,14 @@ class product extends control
/**
* Browse a product.
*
* @param int $productID
* @param string $browseType
* @param int $param
* @param string $orderBy
* @param int $recTotal
* @param int $recPerPage
* @param int $pageID
*
* @param int $productID
* @param string $browseType
* @param int $param
* @param string $orderBy
* @param int $recTotal
* @param int $recPerPage
* @param int $pageID
* @access public
* @return void
*/
@@ -136,8 +136,9 @@ class product extends control
if($browseType == 'bymodule') setcookie('storyModule', (int)$param, $this->config->cookieLife, $this->config->webRoot);
if($browseType != 'bymodule') $this->session->set('storyBrowseType', $browseType);
$moduleID = ($browseType == 'bymodule') ? (int)$param : ($browseType == 'bysearch' ? 0 : ($this->cookie->storyModule ? $this->cookie->storyModule : 0));
$queryID = ($browseType == 'bysearch') ? (int)$param : 0;
$moduleID = ($browseType == 'bymodule') ? (int)$param : ($browseType == 'bysearch' ? 0 : ($this->cookie->storyModule ? $this->cookie->storyModule : 0));
$queryID = ($browseType == 'bysearch') ? (int)$param : 0;
if($browseType == 'unclosed') $moduleID = 0;
/* Set menu. */
$this->product->setMenu($this->products, $productID, $branch);
module/task/model.php
+1 -1
View File
@@ -939,7 +939,7 @@ class taskModel extends model
/**
* Get project tasks pairs.
*
*
* @param int $projectID
* @param string $status
* @param string $orderBy
module/tree/model.php
+6 -6
View File
@@ -1175,11 +1175,11 @@ class treeModel extends model
/**
* Manage childs of a module.
*
* @param int $rootID
* @param string $type
* @param int $parentModuleID
* @param array $childs
*
* @param int $rootID
* @param string $type
* @param int $parentModuleID
* @param array $childs
* @access public
* @return void
*/
@@ -1246,7 +1246,7 @@ class treeModel extends model
/**
* Update a module.
*
*
* @param int $moduleID
* @access public
* @return void
module/tree/view/browse.html.php
+2 -2
View File
@@ -30,7 +30,7 @@
<form id='childrenForm' class='form-condensed' method='post' target='hiddenwin' action='<?php echo $this->createLink('tree', 'manageChild', "root={$root->id}&viewType=$viewType");?>'>
<div class='panel'>
<div class='panel-heading'>
<i class='icon-sitemap'></i>
<i class='icon-sitemap'></i>
<?php $manageChild = 'manage' . ucfirst($viewType) . 'Child';?>
<?php echo strpos($viewType, 'doc') !== false ? $lang->doc->manageType : $lang->tree->$manageChild;?>
<?php if($viewType == 'story' and $allProduct):?>
@@ -53,7 +53,7 @@
?>
</nobr>
</td>
<td id='moduleBox'>
<td id='moduleBox'>
<?php
if($viewType == 'story' and $allProduct)
{