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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
王怡栋
2022-03-08 13:30:35 +08:00
parent 1e8e9d5a45 0c7bb72c10
commit d62013b39f
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/control.php
+1 -1
View File
@@ -372,7 +372,7 @@ class product extends control
$moduleName = $tab == 'program'? 'program' : $this->moduleName;
$methodName = $tab == 'program'? 'product' : 'browse';
$param = $tab == 'program' ? "programID=$programID" : "productID=$productID";
$locate = $this->createLink($moduleName, $methodName, $param);
$locate = isonlybody() ? 'parent' : $this->createLink($moduleName, $methodName, $param);
if($tab == 'doc') $locate = $this->createLink('doc', 'objectLibs', 'type=product');
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locate));
}
module/upgrade/model.php
+6 -7
View File
@@ -54,22 +54,22 @@ class upgradeModel extends model
foreach($this->config->upgrade->proVersion as $pro => $open)
{
if(!isset($versions[$open])) continue;
if(version_compare(str_replace('_', '.', $openVersion), '16.4', '>=') or $edition == 'pro') $versions[$open]['pro'][] = $pro;
if(version_compare(str_replace('_', '.', $openVersion), '16.4', '>=') or $fromEdition == 'pro') $versions[$open]['pro'][] = $pro;
}
foreach($this->config->upgrade->bizVersion as $biz => $open)
{
if(!isset($versions[$open])) continue;
if(version_compare(str_replace('_', '.', $openVersion), '16.4', '>=') or $edition == 'biz') $versions[$open]['biz'][] = $biz;
if(version_compare(str_replace('_', '.', $openVersion), '16.4', '>=') or $fromEdition == 'biz') $versions[$open]['biz'][] = $biz;
}
foreach($this->config->upgrade->maxVersion as $max => $open)
{
if(!isset($versions[$open])) continue;
if(version_compare(str_replace('_', '.', $openVersion), '16.4', '>=') or $edition == 'max') $versions[$open]['max'][] = $max;
if(version_compare(str_replace('_', '.', $openVersion), '16.4', '>=') or $fromEdition == 'max') $versions[$open]['max'][] = $max;
}
/* If the 'current openVersion' is not equal the 'from openVersion', must update structure. */
$currentVersion = str_replace('.', '_', $this->config->version);
$updateStructure = $openVersion != $this->config->upgrade->{$this->config->edition . 'Version'}[$currentVersion];
$updateStructure = $openVersion != ($this->config->edition == 'open' ? $currentVersion : $this->config->upgrade->{$this->config->edition . 'Version'}[$currentVersion]);
/* Execute. */
foreach($versions as $openVersion => $chargedVersions)
@@ -598,9 +598,7 @@ class upgradeModel extends model
public function getConfirm($fromVersion)
{
$confirmContent = '';
$openVersion = $fromVersion;
$confirmContent .= $this->getOpenConfirm($openVersion, $fromVersion);
$openVersion = $fromVersion;
if($fromVersion[0] == 'p')
{
@@ -626,6 +624,7 @@ class upgradeModel extends model
$confirmContent .= $this->getMaxConfirm($fromVersion);
}
$confirmContent = $this->getOpenConfirm($openVersion, $fromVersion) . $confirmContent;
return str_replace('zt_', $this->config->db->prefix, $confirmContent);
}