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

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

Browse Source
This commit is contained in:
zhouxin
2023-04-28 02:16:23 +00:00
parent a47617863b 498f70d22d
commit bc03202739
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/control.php
+1 -1
View File
@@ -21,7 +21,7 @@ class product extends control
* @access public
* @return void
*/
public function __construct(string $moduleName = '', string $methodName = ''): void
public function __construct(string $moduleName = '', string $methodName = '')
{
parent::__construct($moduleName, $methodName);
module/product/zen.php
+9 -3
View File
@@ -174,6 +174,7 @@ class productZen extends product
->join('reviewer', ',')
->remove('uid,newLine,lineName,contactListMenu')
->get();
$product = $this->loadModel('file')->processImgURL($product, $this->config->product->editor->create['id'], $this->post->uid);
return $product;
@@ -211,7 +212,12 @@ class productZen extends product
$message = $this->executeHooks($productID);
if($message) $this->lang->saveSuccess = $message;
if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $productID));
if($this->viewType == 'json')
{
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $productID));
return;
}
$this->sendCreateLocate($productID, (int)$product->program);
}
@@ -233,7 +239,7 @@ class productZen extends product
$locate = isonlybody() ? 'true' : $this->createLink($moduleName, $methodName, $param);
if($tab == 'doc') $locate = $this->createLink('doc', 'productSpace', "objectID=$productID");
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => $locate));
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => $locate));
}
/**
@@ -245,6 +251,6 @@ class productZen extends product
*/
protected function sendError4Create(): void
{
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
}
}