* Fix doc order.
This commit is contained in:
@@ -1134,66 +1134,6 @@ class docModel extends model
|
||||
|
||||
if($type == 'product' or $type == 'project') $libs = $this->dao->select('*')->from($table)->where('id')->in(array_keys($libs))->orderBy('`order` desc')->fetchAll('id');
|
||||
|
||||
/* Order the same as drop menu.*/
|
||||
if($type == 'product')
|
||||
{
|
||||
$this->loadModel('product');
|
||||
$products = $mineProducts = $otherProducts = $closedProducts = array();
|
||||
foreach($libs as $lib)
|
||||
{
|
||||
if(!$this->app->user->admin and !$this->product->checkPriv($lib->id)) continue;
|
||||
if($lib->status == 'normal' and $lib->PO == $this->app->user->account)
|
||||
{
|
||||
$mineProducts[$lib->id] = $lib;
|
||||
}
|
||||
elseif($lib->status == 'normal' and $lib->PO != $this->app->user->account)
|
||||
{
|
||||
$otherProducts[$lib->id] = $lib;
|
||||
}
|
||||
elseif($lib->status == 'closed')
|
||||
{
|
||||
$closedProducts[$lib->id] = $lib;
|
||||
}
|
||||
}
|
||||
$products = $mineProducts + $otherProducts + $closedProducts;
|
||||
$libs = array();
|
||||
foreach($products as $product)
|
||||
{
|
||||
$libs[$product->id] = new stdclass();
|
||||
$libs[$product->id]->id = $product->id;
|
||||
$libs[$product->id]->name = $product->name;
|
||||
}
|
||||
}
|
||||
elseif($type == 'project')
|
||||
{
|
||||
$this->loadModel('project');
|
||||
$projects = $mineProjects = $otherProjects = $closedProjects = array();
|
||||
foreach($libs as $lib)
|
||||
{
|
||||
if(!$this->app->user->admin and !$this->project->checkPriv($lib->id)) continue;
|
||||
if($lib->status != 'done' and $lib->status != 'closed' and $lib->PM == $this->app->user->account)
|
||||
{
|
||||
$mineProjects[$lib->id] = $lib;
|
||||
}
|
||||
elseif($lib->status != 'done' and $lib->status != 'closed' and !($lib->PM == $this->app->user->account))
|
||||
{
|
||||
$otherProjects[$lib->id] = $lib;
|
||||
}
|
||||
elseif($lib->status == 'done' or $lib->status == 'closed')
|
||||
{
|
||||
$closedProjects[$lib->id] = $lib;
|
||||
}
|
||||
}
|
||||
$projects = $mineProjects + $otherProjects + $closedProjects;
|
||||
$libs = array();
|
||||
foreach($projects as $project)
|
||||
{
|
||||
$libs[$project->id] = new stdclass();
|
||||
$libs[$project->id]->id = $project->id;
|
||||
$libs[$project->id]->name = $project->name;
|
||||
}
|
||||
}
|
||||
|
||||
return $libs;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user