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

* Fix doc getlibs method.

Browse Source
This commit is contained in:
Yagami
2018-11-19 15:23:21 +08:00
parent 0a1f17db54
commit ecf4ffafe1
4 changed files with 23 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/control.php
+1 -17
View File
@@ -387,22 +387,6 @@ class doc extends control
$this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('doc', 'view', "docID=$docID")));
}
$libs = $this->doc->getLibs();
foreach($libs as $id => $libName)
{
$lib = $this->doc->getLibById($id);
if($lib->project != 0)
{
$project = $this->loadModel('project')->getByID($lib->project);
$libs[$id] = $project->name . '/' . $libName;
}
if($lib->product != 0)
{
$product = $this->loadModel('product')->getByID($lib->product);
$libs[$id] = $product->name . '/' . $libName;
}
}
/* Get doc and set menu. */
$doc = $this->doc->getById($docID);
$libID = $doc->lib;
@@ -420,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 = $libs;
$this->view->libs = $this->doc->getCompleteLibName();
$this->view->groups = $this->loadModel('group')->getPairs();
$this->view->users = $this->user->getPairs('noletter', $doc->users);
$this->display();
module/doc/model.php
+20
View File
@@ -1523,4 +1523,24 @@ 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;
}
}