* Merge sql.

This commit is contained in:
Yagami
2020-12-16 16:52:37 +08:00
parent b8d97f2f2d
commit ae552beafa
16 changed files with 220 additions and 92 deletions

View File

@@ -675,7 +675,6 @@ class program extends control
*/
public function PRJCreate($model = 'waterfall', $programID = 0, $from = 'PRJ', $copyProjectID = '')
{
$this->app->loadLang('custom');
if($from == 'PRJ')
{
$this->lang->navGroup->program = 'project';
@@ -761,6 +760,7 @@ class program extends control
$this->view->from = $from;
$this->view->programList = $this->program->getParentPairs();
$this->view->parentProgram = $this->program->getPGMByID($programID);
$this->view->URSRPairs = $this->loadModel('custom')->getURSRPairs();
$this->display();
}
@@ -825,6 +825,7 @@ class program extends control
$this->view->productPlans = $productPlans;
$this->view->linkedProducts = $linkedProducts;
$this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($linkedProducts), '', $linkedBranches);
$this->view->URSRPairs = $this->loadModel('custom')->getURSRPairs();
$this->display();
}

View File

@@ -134,7 +134,7 @@
<tr>
<th><?php echo $lang->program->PRJStoryConcept;?></th>
<td>
<?php echo html::select('storyConcept', $lang->custom->URSRList, zget($config->custom, 'URSRName', 1), "class='form-control chosen'");?>
<?php echo html::select('storyConcept', $URSRPairs, '', "class='form-control chosen'");?>
</td>
</tr>
<tr>

View File

@@ -134,7 +134,7 @@
<tr>
<th><?php echo $lang->program->PRJStoryConcept;?></th>
<td>
<?php echo html::select('storyConcept', $lang->custom->URSRList, $project->storyConcept, "class='form-control chosen'");?>
<?php echo html::select('storyConcept', $URSRPairs, '', "class='form-control chosen'");?>
</td>
</tr>
<tr>