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

* adjust for doc drop menu.

Browse Source
This commit is contained in:
wangyidong
2016-11-09 14:13:51 +08:00
parent 199e5bd3bf
commit 5e4340489f
8 changed files with 62 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/model.php
+12 -17
View File
@@ -24,8 +24,6 @@ class docModel extends model
*/
public function setMenu($libs, $libID = 0, $moduleID = 0)
{
$currentModule = 'doc';
$currentMethod = 'browse';
if($libID)
{
$lib = $this->getLibById($libID);
@@ -34,6 +32,14 @@ class docModel extends model
echo(js::alert($this->lang->doc->accessDenied));
die(js::locate('back'));
}
if($lib->product or $lib->project)
{
$table = $lib->product ? TABLE_PRODUCT : TABLE_PROJECT;
$objectID = $lib->product ? $lib->product : $lib->project;
$object = $this->dao->select('id,name')->from($table)->where('id')->eq($objectID)->fetch();
if($object) $libs[$libID] = $object->name . ' / ' . $lib->name;
}
}
$selectHtml = "<a id='currentItem' data-lib-id='$libID' href=\"javascript:showLibMenu()\">{$libs[$libID]} <span class='icon-caret-down'></span></a><div id='dropMenu'><i class='icon icon-spin icon-spinner'></i><div id='libMenu'><div id='libMenuHeading'><input id='searchLib' type='search' placeholder='{$this->lang->doc->searchDoc}' class='form-control'></div><div id='libMenuGroups' class='clearfix'><div class='lib-menu-group' id='libMenuProductGroup'><div class='lib-menu-list-heading' data-type='product'>{$this->lang->doc->libTypeList['product']}<i class='icon icon-remove'></i></div><div class='lib-menu-list clearfix'></div></div><div class='lib-menu-group' id='libMenuProjectGroup'><div class='lib-menu-list-heading' data-type='project'>{$this->lang->doc->libTypeList['project']}<i class='icon icon-remove'></i></div><div class='lib-menu-list clearfix'></div></div><div class='lib-menu-group' id='libMenuCustomGroup'><div class='lib-menu-list-heading' data-type='custom'>{$this->lang->doc->libTypeList['custom']}<i class='icon icon-remove'></i></div><div class='lib-menu-list clearfix'></div></div></div></div></div>";
@@ -83,7 +89,6 @@ class docModel extends model
->andWhere('t1.deleted')->eq(0)
->orderBy("t2.order desc, t1.id")
->query();
$objects = $this->dao->select('id,name')->from($table)->where('deleted')->eq('0')->fetchPairs('id', 'name');
}
else
{
@@ -93,12 +98,7 @@ class docModel extends model
$libPairs = array();
while($lib = $stmt->fetch())
{
if($this->checkPriv($lib))
{
$libName = $lib->name;
if(($type == 'product' or $type == 'project') and isset($objects[$lib->$type])) $libName = $objects[$lib->$type] . ' / ' . $libName;
$libPairs[$lib->id] = $libName;
}
if($this->checkPriv($lib)) $libPairs[$lib->id] = $lib->name;
}
return $libPairs;
}
@@ -629,14 +629,9 @@ class docModel extends model
* @access public
* @return array
*/
public function getAllLibsByType($type, $pager = null, $extra = '')
public function getAllLibsByType($type, $pager = null, $product = '')
{
if($extra)
{
parse_str($extra);
if(isset($product) and $type == 'project') $projects = $this->dao->select('*')->from(TABLE_PROJECTPRODUCT)->where('product')->eq($product)->fetchPairs('project', 'project');
}
if($product and $type == 'project') $projects = $this->dao->select('*')->from(TABLE_PROJECTPRODUCT)->where('product')->eq($product)->fetchPairs('project', 'project');
$key = ($type == 'product' or $type == 'project') ? $type : 'id';
$stmt = $this->dao->select("DISTINCT $key")->from(TABLE_DOCLIB)->where('deleted')->eq(0);
@@ -1145,7 +1140,7 @@ class docModel extends model
if(empty($libID)) return '';
$parents = $moduleID ? $this->loadModel('tree')->getParents($moduleID) : array();
$crumb = html::a(helper::createLink('doc', 'browse', "libID=$libID&browseType=all&param=0&orderBy=id_desc"), '/');
$crumb = html::a(helper::createLink('doc', 'browse', "libID=$libID&browseType=all&param=0&orderBy=id_desc"), 'ROOT');
foreach($parents as $module) $crumb .= $this->lang->arrow . html::a(helper::createLink('doc', 'browse', "libID=$libID&browseType=byModule&param=$module->id&orderBy=id_desc"), $module->name);
return $crumb;
}