diff --git a/extension/lite/group/ext/lang/resource.php b/extension/lite/group/ext/lang/resource.php index c18325a471..7f4f56f362 100644 --- a/extension/lite/group/ext/lang/resource.php +++ b/extension/lite/group/ext/lang/resource.php @@ -570,31 +570,41 @@ $lang->task->methodOrder[125] = 'import'; /* Doc. */ $lang->resource->doc = new stdclass(); -$lang->resource->doc->index = 'index'; -$lang->resource->doc->mySpace = 'mySpace'; -$lang->resource->doc->quick = 'quick'; -$lang->resource->doc->createSpace = 'createSpace'; -$lang->resource->doc->createLib = 'createLibAction'; -$lang->resource->doc->editLib = 'editLibAction'; -$lang->resource->doc->deleteLib = 'deleteLibAction'; -$lang->resource->doc->moveLib = 'moveLibAction'; -$lang->resource->doc->moveDoc = 'moveDocAction'; -$lang->resource->doc->create = 'create'; -$lang->resource->doc->view = 'view'; -$lang->resource->doc->edit = 'edit'; -$lang->resource->doc->delete = 'delete'; -$lang->resource->doc->deleteFile = 'deleteFile'; -$lang->resource->doc->collect = 'collectAction'; -$lang->resource->doc->projectSpace = 'projectSpace'; -$lang->resource->doc->teamSpace = 'teamSpace'; -$lang->resource->doc->showFiles = 'showFiles'; -$lang->resource->doc->addCatalog = 'addCatalog'; -$lang->resource->doc->editCatalog = 'editCatalog'; -$lang->resource->doc->sortDoclib = 'sortDoclib'; -$lang->resource->doc->sortCatalog = 'sortCatalog'; -$lang->resource->doc->sortDoc = 'sortDoc'; -$lang->resource->doc->deleteCatalog = 'deleteCatalog'; -// $lang->resource->doc->displaySetting = 'displaySetting'; +$lang->resource->doc->index = 'index'; +$lang->resource->doc->mySpace = 'mySpace'; +$lang->resource->doc->quick = 'quick'; +$lang->resource->doc->createSpace = 'createSpace'; +$lang->resource->doc->createLib = 'createLibAction'; +$lang->resource->doc->editLib = 'editLibAction'; +$lang->resource->doc->deleteLib = 'deleteLibAction'; +$lang->resource->doc->moveLib = 'moveLibAction'; +$lang->resource->doc->moveDoc = 'moveDocAction'; +$lang->resource->doc->create = 'create'; +$lang->resource->doc->view = 'view'; +$lang->resource->doc->edit = 'edit'; +$lang->resource->doc->delete = 'delete'; +$lang->resource->doc->deleteFile = 'deleteFile'; +$lang->resource->doc->collect = 'collectAction'; +$lang->resource->doc->projectSpace = 'projectSpace'; +$lang->resource->doc->teamSpace = 'teamSpace'; +$lang->resource->doc->showFiles = 'showFiles'; +$lang->resource->doc->addCatalog = 'addCatalog'; +$lang->resource->doc->editCatalog = 'editCatalog'; +$lang->resource->doc->sortDoclib = 'sortDoclib'; +$lang->resource->doc->sortCatalog = 'sortCatalog'; +$lang->resource->doc->sortDoc = 'sortDoc'; +$lang->resource->doc->deleteCatalog = 'deleteCatalog'; +$lang->resource->doc->browseTemplate = 'browseTemplate'; +$lang->resource->doc->createTemplate = 'createTemplate'; +$lang->resource->doc->editTemplate = 'editTemplate'; +$lang->resource->doc->moveTemplate = 'moveTemplate'; +$lang->resource->doc->sortTemplate = 'sortTemplate'; +$lang->resource->doc->deleteTemplate = 'deleteTemplate'; +$lang->resource->doc->viewTemplate = 'viewTemplate'; +$lang->resource->doc->addTemplateType = 'addTemplateType'; +$lang->resource->doc->editTemplateType = 'editTemplateType'; +$lang->resource->doc->deleteTemplateType = 'deleteTemplateType'; +$lang->resource->doc->manageScope = 'manageScope'; $lang->doc->methodOrder[5] = 'index'; $lang->doc->methodOrder[10] = 'mySpace'; diff --git a/module/doc/model.php b/module/doc/model.php index 762f5c5f97..915b0301d3 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -661,6 +661,7 @@ class docModel extends model { return $this->dao->select('*')->from(TABLE_DOC) ->where('templateType')->ne('') + ->andWhere('vision')->eq($this->config->vision) ->beginIF(!$this->app->user->admin)->andWhere("(`status` = 'normal' or (`status` = 'draft' and `addedBy`='{$this->app->user->account}'))")->fi() ->beginIF($libID)->andWhere('lib')->eq($libID)->fi() ->beginIF($type == 'draft')->andWhere('status')->eq('draft')->fi() @@ -4189,6 +4190,7 @@ class docModel extends model ->andWhere('deleted')->eq('0') ->andWhere('status')->eq('normal') ->andWhere('parent')->eq(0) + ->andWhere('vision')->eq($this->config->vision) ->beginIF($scopeID)->andWhere('lib')->eq($scopeID)->fi() ->orderBy('hotDate_desc') ->beginIF($limit)->limit($limit)->fi() @@ -4260,6 +4262,7 @@ class docModel extends model return $this->dao->select('*')->from(TABLE_DOC) ->where('deleted')->eq('0') ->andWhere('templateType')->ne('') + ->andWhere('vision')->eq($this->config->vision) ->beginIF(!is_null($type))->andWhere('module')->in($types)->fi() ->beginIF($status != 'all')->andWhere('status')->eq($status)->fi() ->fetchAll('id', false); diff --git a/module/doc/ui/templatehome.html.php b/module/doc/ui/templatehome.html.php index cb3a881c37..72f4b6596c 100644 --- a/module/doc/ui/templatehome.html.php +++ b/module/doc/ui/templatehome.html.php @@ -150,14 +150,14 @@ foreach($scopeList as $scope) featureBar(); toolbar ( - btn + common::hasPriv('doc', 'manageScope') ? btn ( setData(array('toggle' => 'modal', 'size' => 'sm')), set::text($lang->doc->manageScope), set::icon('plus'), set::type('primary'), set::url(createLink('doc', 'manageScope')) - ) + ) : null ); div diff --git a/module/group/packagemanager.php b/module/group/packagemanager.php index b95a336030..d57f96ae26 100644 --- a/module/group/packagemanager.php +++ b/module/group/packagemanager.php @@ -2953,27 +2953,27 @@ $config->group->package->browseDoctemplate = new stdclass(); $config->group->package->browseDoctemplate->order = 5; $config->group->package->browseDoctemplate->subset = 'doctemplate'; $config->group->package->browseDoctemplate->privs = array(); -$config->group->package->browseDoctemplate->privs['doc-browseTemplate'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array(), 'recommend' => array('doc-viewTemplate')); -$config->group->package->browseDoctemplate->privs['doc-viewTemplate'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array('doc-browseTemplate'), 'recommend' => array('doc-createTemplate', 'doc-editTemplate', 'doc-moveTemplate')); +$config->group->package->browseDoctemplate->privs['doc-browseTemplate'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 0, 'depend' => array(), 'recommend' => array('doc-viewTemplate')); +$config->group->package->browseDoctemplate->privs['doc-viewTemplate'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 0, 'depend' => array('doc-browseTemplate'), 'recommend' => array('doc-createTemplate', 'doc-editTemplate', 'doc-moveTemplate')); $config->group->package->manageDoctemplate = new stdclass(); $config->group->package->manageDoctemplate->order = 15; $config->group->package->manageDoctemplate->subset = 'doctemplate'; $config->group->package->manageDoctemplate->privs = array(); -$config->group->package->manageDoctemplate->privs['doc-createTemplate'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array('doc-browseTemplate', 'doc-viewTemplate', 'doc-editTemplate'), 'recommend' => array()); -$config->group->package->manageDoctemplate->privs['doc-editTemplate'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array('doc-browseTemplate', 'doc-viewTemplate'), 'recommend' => array('doc-createTemplate', 'doc-moveTemplate')); -$config->group->package->manageDoctemplate->privs['doc-moveTemplate'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array('doc-browseTemplate', 'doc-viewTemplate'), 'recommend' => array('doc-createTemplate', 'doc-editTemplate')); -$config->group->package->manageDoctemplate->privs['doc-addTemplateType'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array('doc-browseTemplate', 'doc-editTemplateType'), 'recommend' => array('doc-deleteTemplateType')); -$config->group->package->manageDoctemplate->privs['doc-editTemplateType'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array('doc-browseTemplate', 'doc-addTemplateType'), 'recommend' => array('doc-deleteTemplateType')); -$config->group->package->manageDoctemplate->privs['doc-sortTemplate'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array('doc-browseTemplate'), 'recommend' => array()); -$config->group->package->manageDoctemplate->privs['doc-manageScope'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array(), 'recommend' => array()); +$config->group->package->manageDoctemplate->privs['doc-createTemplate'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 0, 'depend' => array('doc-browseTemplate', 'doc-viewTemplate', 'doc-editTemplate'), 'recommend' => array()); +$config->group->package->manageDoctemplate->privs['doc-editTemplate'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 0, 'depend' => array('doc-browseTemplate', 'doc-viewTemplate'), 'recommend' => array('doc-createTemplate', 'doc-moveTemplate')); +$config->group->package->manageDoctemplate->privs['doc-moveTemplate'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 0, 'depend' => array('doc-browseTemplate', 'doc-viewTemplate'), 'recommend' => array('doc-createTemplate', 'doc-editTemplate')); +$config->group->package->manageDoctemplate->privs['doc-addTemplateType'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 0, 'depend' => array('doc-browseTemplate', 'doc-editTemplateType'), 'recommend' => array('doc-deleteTemplateType')); +$config->group->package->manageDoctemplate->privs['doc-editTemplateType'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 0, 'depend' => array('doc-browseTemplate', 'doc-addTemplateType'), 'recommend' => array('doc-deleteTemplateType')); +$config->group->package->manageDoctemplate->privs['doc-sortTemplate'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 0, 'depend' => array('doc-browseTemplate'), 'recommend' => array()); +$config->group->package->manageDoctemplate->privs['doc-manageScope'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 0, 'depend' => array(), 'recommend' => array()); $config->group->package->deleteDoctemplate = new stdclass(); $config->group->package->deleteDoctemplate->order = 20; $config->group->package->deleteDoctemplate->subset = 'doctemplate'; $config->group->package->deleteDoctemplate->privs = array(); -$config->group->package->deleteDoctemplate->privs['doc-deleteTemplate'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 40, 'depend' => array('doc-browseTemplate'), 'recommend' => array()); -$config->group->package->deleteDoctemplate->privs['doc-deleteTemplateType'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array('doc-browseTemplate', 'doc-addTemplateType', 'doc-editTemplateType'), 'recommend' => array('doc-addTemplateType', 'doc-editTemplateType')); +$config->group->package->deleteDoctemplate->privs['doc-deleteTemplate'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 0, 'depend' => array('doc-browseTemplate'), 'recommend' => array()); +$config->group->package->deleteDoctemplate->privs['doc-deleteTemplateType'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 0, 'depend' => array('doc-browseTemplate', 'doc-addTemplateType', 'doc-editTemplateType'), 'recommend' => array('doc-addTemplateType', 'doc-editTemplateType')); $config->group->package->projectStakeholder = new stdclass(); $config->group->package->projectStakeholder->order = 5;