* Adjust for program dropmenu.
This commit is contained in:
@@ -673,10 +673,17 @@ class program extends control
|
||||
*/
|
||||
public function ajaxGetDropMenu($programID, $module, $method)
|
||||
{
|
||||
$programs = $this->program->getList('all');
|
||||
foreach($programs as $programID => $program)
|
||||
{
|
||||
if($program->type != 'program') unset($programs[$programID]);
|
||||
if($module == 'program' && $method == 'product' && $program->parent != 0) unset($programs[$programID]);
|
||||
}
|
||||
|
||||
$this->view->programID = $programID;
|
||||
$this->view->module = $module;
|
||||
$this->view->method = $method;
|
||||
$this->view->programs = $this->program->getList('all');
|
||||
$this->view->programs = $programs;
|
||||
$this->view->link = $this->program->getLink($module, $method, '{id}', '', 'program');
|
||||
$this->display();
|
||||
}
|
||||
|
||||
@@ -1158,7 +1158,7 @@ class programModel extends model
|
||||
*/
|
||||
public function getLink($moduleName, $methodName, $programID, $vars = '', $from = 'program')
|
||||
{
|
||||
if($from != 'program') return helper::createLink('product', 'all', "programID=%s" . $vars);
|
||||
if($from != 'program') return helper::createLink('product', 'all', "programID={$programID}" . $vars);
|
||||
|
||||
if($moduleName == 'project')
|
||||
{
|
||||
@@ -1171,7 +1171,7 @@ class programModel extends model
|
||||
$methodName = 'product';
|
||||
}
|
||||
|
||||
return helper::createLink($moduleName, $methodName, "programID=%s");
|
||||
return helper::createLink($moduleName, $methodName, "programID={$programID}");
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user