* Resolve feedback #1461.
This commit is contained in:
@@ -1368,7 +1368,7 @@ class product extends control
|
||||
$this->view->title = $this->lang->product->line;
|
||||
$this->view->position[] = $this->lang->product->line;
|
||||
|
||||
$this->view->programs = array('') + $this->loadModel('program')->getTopPairs();
|
||||
$this->view->programs = array('') + $this->loadModel('program')->getTopPairs('', 'withDeleted');
|
||||
$this->view->lines = $this->product->getLines();
|
||||
$this->display();
|
||||
}
|
||||
|
||||
@@ -1031,15 +1031,31 @@ class programModel extends model
|
||||
*/
|
||||
public function getTopPairs($model = '', $mode = '', $isQueryAll = false)
|
||||
{
|
||||
return $this->dao->select('id,name')->from(TABLE_PROGRAM)
|
||||
$topPairs = $this->dao->select('id,name')->from(TABLE_PROGRAM)
|
||||
->where('type')->eq('program')
|
||||
->andWhere('grade')->eq(1)
|
||||
->beginIF(strpos($mode, 'noclosed') !== false)->andWhere('status')->ne('closed')->fi()
|
||||
->beginIF(!$isQueryAll)->andWhere('id')->in($this->app->user->view->programs)->fi()
|
||||
->andWhere('deleted')->eq(0)
|
||||
->beginIF(strpos($mode, 'withDeleted') === false)->andWhere('deleted')->eq(0)->fi()
|
||||
->beginIF($model)->andWhere('model')->eq($model)->fi()
|
||||
->orderBy('`order` asc')
|
||||
->fetchPairs();
|
||||
|
||||
if(strpos($mode, 'withDeleted') !== false)
|
||||
{
|
||||
$deletedTopPairs = $this->dao->select('id, name')->from(TABLE_PROGRAM)
|
||||
->where('type')->eq('program')
|
||||
->andWhere('grade')->eq(1)
|
||||
->andWhere('deleted')->eq(1)
|
||||
->fetchPairs();
|
||||
|
||||
foreach($topPairs as $id => $name)
|
||||
{
|
||||
if(isset($deletedTopPairs[$id])) $topPairs[$id] .= ' (' . $this->lang->program->deleted . ')';
|
||||
}
|
||||
}
|
||||
|
||||
return $topPairs;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user