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

* fix bug.

Browse Source
This commit is contained in:
wangyidong
2023-04-17 17:39:42 +08:00
parent 01e3f26c57
commit fed027e5a7
3 changed files with 31 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/config.php
+1
View File
@@ -50,6 +50,7 @@ $config->doc->spaceMethod['mine'] = 'myspace';
$config->doc->spaceMethod['view'] = 'myspace';
$config->doc->spaceMethod['collect'] = 'myspace';
$config->doc->spaceMethod['createdby'] = 'myspace';
$config->doc->spaceMethod['editedby'] = 'myspace';
$config->doc->spaceMethod['product'] = 'productspace';
$config->doc->spaceMethod['project'] = 'projectspace';
$config->doc->spaceMethod['execution'] = 'projectspace';
module/doc/model.php
+10 -9
View File
@@ -1126,7 +1126,7 @@ class docModel extends model
unset($this->config->doc->search['fields']['execution']);
}
if(in_array($type, array('view', 'collect', 'createdby'))) $libPairs = array('' => '') + $this->getLibs('all', 'withObject');
if(in_array($type, array('view', 'collect', 'createdby', 'editedby'))) $libPairs = array('' => '') + $this->getLibs('all', 'withObject');
$this->config->doc->search['module'] = $queryName;
$this->config->doc->search['params']['lib']['values'] = $libPairs + array('all' => $this->lang->doclib->all);
@@ -3147,20 +3147,21 @@ class docModel extends model
$myCreation->hasAction = false;
$myCreation->active = $libType == 'createdby' ? 1 : 0;
$myCreation = new stdclass();
$myCreation->id = 0;
$myCreation->name = $this->lang->doc->myEdited;
$myCreation->type = 'editedBy';
$myCreation->objectType = 'doc';
$myCreation->objectID = 0;
$myCreation->hasAction = false;
$myCreation->active = $libType == 'editedby' ? 1 : 0;
$myEdition = new stdclass();
$myEdition->id = 0;
$myEdition->name = $this->lang->doc->myEdited;
$myEdition->type = 'editedBy';
$myEdition->objectType = 'doc';
$myEdition->objectID = 0;
$myEdition->hasAction = false;
$myEdition->active = $libType == 'editedby' ? 1 : 0;
$libTree = array();
$libTree[] = $myLib;
if(common::hasPriv('doc', 'myView')) $libTree[] = $myView;
if(common::hasPriv('doc', 'myCollection')) $libTree[] = $myCollection;
if(common::hasPriv('doc', 'myCreation')) $libTree[] = $myCreation;
if(common::hasPriv('doc', 'myEdition')) $libTree[] = $myEdition;
}
return $libTree;
}
module/group/lang/resource.php
+20 -18
View File
@@ -1401,6 +1401,7 @@ $lang->resource->doc->mySpace = 'mySpace';
$lang->resource->doc->myView = 'myView';
$lang->resource->doc->myCollection = 'myCollection';
$lang->resource->doc->myCreation = 'myCreation';
$lang->resource->doc->myEdition = 'myEdition';
$lang->resource->doc->createLib = 'createLib';
$lang->resource->doc->editLib = 'editLib';
$lang->resource->doc->deleteLib = 'deleteLib';
@@ -1425,24 +1426,25 @@ $lang->doc->methodOrder[10] = 'mySpace';
$lang->doc->methodOrder[15] = 'myView';
$lang->doc->methodOrder[20] = 'myCollection';
$lang->doc->methodOrder[25] = 'myCreation';
$lang->doc->methodOrder[30] = 'createLib';
$lang->doc->methodOrder[35] = 'editLib';
$lang->doc->methodOrder[40] = 'deleteLib';
$lang->doc->methodOrder[45] = 'create';
$lang->doc->methodOrder[50] = 'edit';
$lang->doc->methodOrder[55] = 'view';
$lang->doc->methodOrder[60] = 'delete';
$lang->doc->methodOrder[65] = 'deleteFile';
$lang->doc->methodOrder[70] = 'collect';
$lang->doc->methodOrder[75] = 'productSpace';
$lang->doc->methodOrder[80] = 'projectSpace';
$lang->doc->methodOrder[85] = 'teamSpace';
$lang->doc->methodOrder[90] = 'showFiles';
$lang->doc->methodOrder[95] = 'addCatalog';
$lang->doc->methodOrder[100] = 'editCatalog';
$lang->doc->methodOrder[105] = 'sortCatalog';
$lang->doc->methodOrder[110] = 'deleteCatalog';
$lang->doc->methodOrder[115] = 'displaySetting';
$lang->doc->methodOrder[30] = 'myEdition';
$lang->doc->methodOrder[35] = 'createLib';
$lang->doc->methodOrder[40] = 'editLib';
$lang->doc->methodOrder[45] = 'deleteLib';
$lang->doc->methodOrder[50] = 'create';
$lang->doc->methodOrder[55] = 'edit';
$lang->doc->methodOrder[60] = 'view';
$lang->doc->methodOrder[65] = 'delete';
$lang->doc->methodOrder[70] = 'deleteFile';
$lang->doc->methodOrder[75] = 'collect';
$lang->doc->methodOrder[80] = 'productSpace';
$lang->doc->methodOrder[85] = 'projectSpace';
$lang->doc->methodOrder[90] = 'teamSpace';
$lang->doc->methodOrder[95] = 'showFiles';
$lang->doc->methodOrder[100] = 'addCatalog';
$lang->doc->methodOrder[105] = 'editCatalog';
$lang->doc->methodOrder[110] = 'sortCatalog';
$lang->doc->methodOrder[115] = 'deleteCatalog';
$lang->doc->methodOrder[120] = 'displaySetting';
/* Mail. */
$lang->resource->mail = new stdclass();