* Merge code.

This commit is contained in:
Yagami
2020-12-09 15:36:40 +08:00
parent c79aa30c87
commit 0924720a8f
17 changed files with 72 additions and 194 deletions
+1 -1
View File
@@ -363,7 +363,7 @@ class programModel extends model
while($program = $stmt->fetch())
{
$link = $from == 'program' ? helper::createLink('program', 'pgmproject', "programID=$program->id") : helper::createLink('product', 'all', "programID=$program->id" . $vars);
$link = $from == 'program' ? helper::createLink('program', 'pgmproduct', "programID=$program->id") : helper::createLink('product', 'all', "programID=$program->id" . $vars);
$linkHtml = html::a($link, "<i class='icon-folder-open-o'></i> " . $program->name, '', "id='program$program->id' class='text-ellipsis' title=$program->name");
if(isset($programMenu[$program->id]) and !empty($programMenu[$program->id]))