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

* Set flow for custom doc menu.

Browse Source
This commit is contained in:
daitingting
2017-05-16 13:53:17 +08:00
parent 07cebfea4a
commit f0e76ff576
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/control.php
+3 -2
View File
@@ -576,7 +576,8 @@ class doc extends control
*/
public function ajaxFixedMenu($libID, $type = 'fixed')
{
$customMenus = $this->loadModel('setting')->getItem("owner={$this->app->user->account}&module=common&section=customMenu&key=doc");
$customMenuKey = $this->config->global->flow . '_doc';
$customMenus = $this->loadModel('setting')->getItem("owner={$this->app->user->account}&module=common&section=customMenu&key={$customMenuKey}");
if($customMenus) $customMenus = json_decode($customMenus);
if(empty($customMenus))
{
@@ -604,7 +605,7 @@ class doc extends control
$customMenu->order = count($customMenus);
$customMenu->float = 'right';
if($type == 'fixed') $customMenus[] = $customMenu;
$this->setting->setItem("{$this->app->user->account}.common.customMenu.doc", json_encode($customMenus));
$this->setting->setItem("{$this->app->user->account}.common.customMenu.{$customMenuKey}", json_encode($customMenus));
die(js::reload('parent'));
}
module/doc/model.php
+4 -3
View File
@@ -24,9 +24,10 @@ class docModel extends model
*/
public function setMenu($libID = 0, $moduleID = 0, $crumb = '')
{
if(isset($this->config->customMenu->doc))
$customMenuKey = $this->config->global->flow . '_doc';
if(isset($this->config->customMenu->{$customMenuKey}))
{
$customMenu = json_decode($this->config->customMenu->doc, true);
$customMenu = json_decode($this->config->customMenu->{$customMenuKey}, true);
$menuLibIdList = array();
foreach($customMenu as $i => $menu)
{
@@ -59,7 +60,7 @@ class docModel extends model
$libName .= $lib->name;
$customMenu[$i]['link'] = "{$libName}|doc|browse|libID={$menuLibID}";
}
$this->config->customMenu->doc = json_encode($customMenu);
$this->config->customMenu->{$customMenuKey} = json_encode($customMenu);
}
$this->app->loadLang('project');