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

* Adjust code

Browse Source
This commit is contained in:
zenggang
2022-07-22 02:01:47 +00:00
parent dba57b45cd
commit c368f63f6d
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/control.php
+12 -8
View File
@@ -157,7 +157,7 @@ class action extends control
$repeatObject = $this->dao->select('*')->from(TABLE_PRODUCT)
->where('id')->ne($oldAction->objectID)
->andWhere("(name = '{$product->name}' and program = {$programID})", true)
->orWhere("code = '{$product->code}'")
->beginIF($product->code)->orWhere("code = '{$product->code}'")->fi()
->markRight(1)
->andWhere('deleted')->eq('0')
->fetch();
@@ -185,17 +185,21 @@ class action extends control
$table = $oldAction->objectType == 'product' ? TABLE_PRODUCT : TABLE_PROJECT;
$object = $oldAction->objectType == 'product' ? $product : $project;
for($i = 1; $i < 1000; $i ++)
$existNames = $this->dao->select('name')->from($table)->where('name')->like($repeatObject->name . '_%')->fetchPairs();
for($i = 1; $i < 10000; $i ++)
{
$replaceName = $repeatObject->name . '_' . $i;
$existName = $this->dao->select('*')->from($table)->where('name')->eq($replaceName)->fetch();
if(!$existName) break;
if(!in_array($replaceName, $existNames)) break;
}
for($i = 1; $i < 1000; $i ++)
$replaceCode = '';
if($object->code)
{
$replaceCode = $repeatObject->code . '_' . $i;
$existCode = $this->dao->select('*')->from($table)->where('code')->eq($replaceCode)->fetch();
if(!$existCode) break;
$existCodes = $this->dao->select('code')->from($table)->where('code')->like($repeatObject->code . '_%')->fetchPairs();
for($i = 1; $i < 10000; $i ++)
{
$replaceCode = $repeatObject->code . '_' . $i;
if(!in_array($replaceCode, $existCodes)) break;
}
}
if($repeatObject->name == $object->name and $repeatObject->code and $repeatObject->code == $object->code)
module/program/view/browse.html.php
+1 -1
View File
@@ -43,7 +43,7 @@
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $lang->program->noProgram;?></span>
<?php common::printLink('program', 'create', '', "<i class='icon icon-plus'></i> " . $lang->program->create, '', "class='btn btn-info'");?>
<?php if($status == 'all') common::printLink('program', 'create', '', "<i class='icon icon-plus'></i> " . $lang->program->create, '', "class='btn btn-info'");?>
</p>
</div>
<?php else:?>