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

* Merge: Fix bug #46082.

Browse Source
This commit is contained in:
hufangzhou
2024-02-29 11:18:57 +08:00
parent 37c2d332fd
commit 76d65b77c0
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/upgrade/model.php
+2 -2
View File
@@ -8100,8 +8100,8 @@ class upgradeModel extends model
$createRequired = str_replace(',line,', ',', ",$createRequired,");
$editRequired = str_replace(',line,', ',', ",$editRequired,");
$this->setting->setItem('system.product.create.requiredFields', trim($createRequired, ','));
$this->setting->setItem('system.product.edit.requiredFields', trim($editRequired, ','));
if(!empty(trim($createRequired, ','))) $this->setting->setItem('system.product.create.requiredFields', trim($createRequired, ','));
if(!empty(trim($editRequired, ','))) $this->setting->setItem('system.product.edit.requiredFields', trim($editRequired, ','));
return true;
}
module/upgrade/test/model/removeproductlinerequired.php
Regular → Executable
+5 -4
View File
@@ -5,11 +5,12 @@ declare(strict_types=1);
/**
title=测试 upgradeModel->removeProductLineRequired().
timeout=0
cid=1
- 检测产品线必填字段是否已经被移除 @1
**/
*/
include dirname(__FILE__, 5) . '/test/lib/init.php';
include dirname(__FILE__, 2) . '/upgrade.class.php';
@@ -31,8 +32,8 @@ function initProductLineRequired()
if(!in_array('line', $createRequiredList)) $createRequiredList[] = 'line';
if(!in_array('line', $editRequiredList)) $editRequiredList[] = 'line';
$tester->setting->setItem('system.product.create.requiredFields', implode(',', $createRequiredList));
$tester->setting->setItem('system.product.edit.requiredFields', implode(',', $editRequiredList));
if(!empty(trim($createRequired, ','))) $tester->setting->setItem('system.product.create.requiredFields', implode(',', $createRequiredList));
if(!empty(trim($editRequired, ','))) $tester->setting->setItem('system.product.edit.requiredFields', implode(',', $editRequiredList));
}
function getCheckResult()
@@ -54,4 +55,4 @@ initProductLineRequired();
$upgrade->removeProductLineRequired();
r(getCheckResult()) && p('') && e(1); //检测产品线必填字段是否已经被移除
r(getCheckResult()) && p('') && e(1); //检测产品线必填字段是否已经被移除