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/zentaopms

Browse Source
This commit is contained in:
holan20180123
2020-12-28 14:29:32 +08:00
parent cf23b03eb5 33db93c8e7
commit ae134b8424
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/view/bug.html.php
+2 -2
View File
@@ -51,8 +51,8 @@
<?php endif;?>
<?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
</th>
<th class='w-50px' title='<?php echo $lang->bug->severity;?>'> <?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
<th class='w-50px' title='<?php echo $lang->bug->pri;?>'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th class='w-50px' title='<?php echo $lang->bug->severity;?>'> <?php common::printOrderLink('severity', $orderBy, $vars, $lang->bug->severityAB);?></th>
<th class='w-50px' title='<?php echo $lang->bug->pri;?>'> <?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
<th> <?php common::printOrderLink('title', $orderBy, $vars, $lang->bug->title);?></th>
<th class='w-150px'><?php common::printOrderLink('productName', $orderBy, $vars, $lang->bug->product);?></th>
<th class='w-type'> <?php common::printOrderLink('type', $orderBy, $vars, $lang->typeAB);?></th>
module/program/model.php
+4 -3
View File
@@ -1302,6 +1302,7 @@ class programModel extends model
}
}
$parentProgram = new stdClass();
if($project->parent)
{
$parentProgram = $this->dao->select('*')->from(TABLE_PROGRAM)->where('id')->eq($project->parent)->fetch();
@@ -1342,7 +1343,7 @@ class programModel extends model
if(empty($_POST['productName']))
{
$this->app->loadLang('product');
dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->product->name);
dao::$errors['productName'] = sprintf($this->lang->error->notempty, $this->lang->product->name);
return false;
}
else
@@ -1350,7 +1351,7 @@ class programModel extends model
$existProductName = $this->dao->select('name')->from(TABLE_PRODUCT)->where('name')->eq($_POST['productName'])->fetch('name');
if(!empty($existProductName))
{
dao::$errors[] = $this->lang->program->existProductName;
dao::$errors['productName'] = $this->lang->program->existProductName;
return false;
}
}
@@ -1401,7 +1402,7 @@ class programModel extends model
$product = new stdclass();
$product->name = $this->post->productName ? $this->post->productName : $project->name;
$product->bind = $this->post->productName ? 0 : 1;
$product->program = $project->parent;
$product->program = $project->parent ? current(array_filter(explode(',', $parentProgram->path))) : 0;
$product->storyConcept = $project->storyConcept;
$product->acl = $project->acl = 'open' ? 'open' : 'private';
$product->PO = $project->PM;