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

* Merge code.

Browse Source
This commit is contained in:
Yagami
2020-12-07 15:07:57 +08:00
parent e1a40daddc
commit 2914b834b2
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update20.0.alpha1.sql
+3
View File
@@ -18,3 +18,6 @@ INSERT INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`) VA
('zh-cn', 'custom', 'SRList', '2', '软需', '1'),
('zh-cn', 'custom', 'SRList', '3', '故事', '1'),
('zh-cn', 'custom', 'SRList', '4', '故事', '1');
TRUNCATE TABLE `zt_block`;
DELETE FROM `zt_config` WHERE `key` = 'blockInited';
module/product/control.php
+2 -2
View File
@@ -689,8 +689,8 @@ class product extends control
*/
public function ajaxGetDropMenu($productID, $module, $method, $extra)
{
$inProduct = zget($this->lang->navGroup, $module) == 'product';
$products = $inProduct ? $this->product->getList() : $this->product->getProductsByProject($this->session->PRJ);
$inProduct = zget($this->lang->navGroup, $this->app->rawModule) == 'product';
$products = $inProduct ? $this->product->getList() : $this->product->getProductsByProject($this->session->PRJ);
$this->view->link = $this->product->getProductLink($module, $method, $extra);
$this->view->productID = $productID;