Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Adjust code.

Browse Source
This commit is contained in:
chenfeiCF
2018-11-20 11:14:06 +08:00
parent 470e5d4e86
commit 95408a4142
6 changed files with 27 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/control.php
+1 -1
View File
@@ -404,7 +404,7 @@ class doc extends control
$this->view->doc = $doc;
$this->view->moduleOptionMenu = $this->tree->getOptionMenu($libID, 'doc', $startModuleID = 0);
$this->view->type = $type;
$this->view->libs = $this->doc->getCompleteLibName();
$this->view->libs = $this->doc->getLibs($type = 'all', $extra = 'withObject');
$this->view->groups = $this->loadModel('group')->getPairs();
$this->view->users = $this->user->getPairs('noletter', $doc->users);
$this->display();
module/doc/model.php
+16 -21
View File
@@ -157,10 +157,25 @@ class docModel extends model
->orderBy('`order`, id desc')->query();
}
if(strpos($extra, 'withObject') !== false)
{
$products = $this->loadModel('product')->getPairs();
$projects = $this->loadModel('project')->getPairs();
}
$libPairs = array();
while($lib = $stmt->fetch())
{
if($this->checkPrivLib($lib, $extra)) $libPairs[$lib->id] = $lib->name;
if($this->checkPrivLib($lib, $extra))
{
if(strpos($extra, 'withObject') !== false)
{
if($lib->product != 0) $lib->name = zget($products, $lib->product, '') . '/' . $lib->name;
if($lib->project != 0) $lib->name = zget($projects, $lib->project, '') . '/' . $lib->name;
}
$libPairs[$lib->id] = $lib->name;
}
}
if(!empty($appendLibs))
@@ -1523,24 +1538,4 @@ class docModel extends model
return $actions;
}
public function getCompleteLibName()
{
$libPairs = array();
$products = $this->loadModel('product')->getPairs();
$projects = $this->loadModel('project')->getPairs();
$stmt = $this->dao->select('id,project,product,name')->from(TABLE_DOCLIB)->where('deleted')->eq(0)->query();
while($lib = $stmt->fetch())
{
if($this->checkPrivLib($lib))
{
if($lib->product != 0) $lib->name = zget($products, $lib->product) . '/' . $lib->name;
if($lib->project != 0) $lib->name = zget($projects, $lib->project) . '/' . $lib->name;
$libPairs[$lib->id] = $lib->name;
}
}
return $libPairs;
}
}