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

* Fix bug#39068, #39109.

Browse Source
This commit is contained in:
zhujinyong
2023-10-06 18:31:13 +08:00
parent 4eb54b6577
commit 803fcd5005
2 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/model.php
+6 -9
View File
@@ -2354,19 +2354,16 @@ class groupModel extends model
*/
public function loadResourceLang()
{
foreach($this->lang->resource as $moduleName => $action) $this->app->loadLang($moduleName);
$this->app->loadLang('doc');
$this->app->loadLang('api');
foreach($this->lang->resource as $moduleName => $action)
{
$this->app->loadLang($moduleName);
$this->lang->custom->common = $this->lang->group->config;
$this->lang->doc->common = $this->lang->doc->manage;
$this->lang->api->common = $this->lang->api->manage;
$this->lang->custom->common = $this->lang->group->config;
$this->lang->doc->common = $this->lang->doc->manage;
$this->lang->api->common = $this->lang->api->manage;
if(($this->config->edition == 'max' or $this->config->edition == 'ipd') and $this->config->vision == 'rnd' and isset($this->lang->baseline)) $this->lang->baseline->common = $this->lang->group->docTemplate;
}
if(($this->config->edition == 'max' or $this->config->edition == 'ipd') and $this->config->vision == 'rnd' and isset($this->lang->baseline)) $this->lang->baseline->common = $this->lang->group->docTemplate;
}
/**
module/group/packagemanager.php
+25 -25
View File
@@ -3028,21 +3028,21 @@ $config->group->package->custom->privs['custom-kanban'] = array('edi
$config->group->package->custom->privs['custom-setStoryConcept'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 6, 'depend' => array('admin-index', 'admin-register', 'custom-browseStoryConcept'), 'recommend' => array());
$config->group->package->custom->privs['custom-limitTaskDate'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array('admin-index', 'admin-register', 'custom-execution'), 'recommend' => array());
$config->group->package->cmcl = new stdclass();
$config->group->package->cmcl->order = 10;
$config->group->package->cmcl->subset = 'featureconfig';
$config->group->package->cmcl->privs = array();
$config->group->package->cmcl->privs['approval-progress'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array(), 'recommend' => array());
$config->group->package->cmcl->privs['approvalflow-browse'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 4, 'depend' => array(), 'recommend' => array());
$config->group->package->cmcl->privs['approvalflow-create'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 6, 'depend' => array('approvalflow-browse'), 'recommend' => array('approvalflow-delete', 'approvalflow-design', 'approvalflow-edit', 'approvalflow-view'));
$config->group->package->cmcl->privs['approvalflow-edit'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 7, 'depend' => array('approvalflow-browse'), 'recommend' => array('approvalflow-create', 'approvalflow-delete', 'approvalflow-design', 'approvalflow-view'));
$config->group->package->cmcl->privs['approvalflow-view'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('approvalflow-browse'), 'recommend' => array());
$config->group->package->cmcl->privs['approvalflow-design'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 8, 'depend' => array('approvalflow-browse'), 'recommend' => array('approvalflow-create', 'approvalflow-delete', 'approvalflow-edit', 'approvalflow-view'));
$config->group->package->cmcl->privs['approvalflow-delete'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 9, 'depend' => array('approvalflow-browse'), 'recommend' => array('approvalflow-create', 'approvalflow-design', 'approvalflow-edit', 'approvalflow-view'));
$config->group->package->cmcl->privs['approvalflow-role'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array(), 'recommend' => array());
$config->group->package->cmcl->privs['approvalflow-createRole'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 1, 'depend' => array('approvalflow-role'), 'recommend' => array('approvalflow-deleteRole', 'approvalflow-editRole'));
$config->group->package->cmcl->privs['approvalflow-editRole'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 2, 'depend' => array('approvalflow-role'), 'recommend' => array('approvalflow-createRole', 'approvalflow-deleteRole'));
$config->group->package->cmcl->privs['approvalflow-deleteRole'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 3, 'depend' => array('approvalflow-role'), 'recommend' => array('approvalflow-createRole', 'approvalflow-editRole'));
$config->group->package->approvalflow = new stdclass();
$config->group->package->approvalflow->order = 10;
$config->group->package->approvalflow->subset = 'featureconfig';
$config->group->package->approvalflow->privs = array();
$config->group->package->approvalflow->privs['approval-progress'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array('approvalflow-browse'), 'recommend' => array());
$config->group->package->approvalflow->privs['approvalflow-browse'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 4, 'depend' => array('approvalflow-role'), 'recommend' => array());
$config->group->package->approvalflow->privs['approvalflow-create'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 6, 'depend' => array('approvalflow-browse'), 'recommend' => array('approvalflow-delete', 'approvalflow-design', 'approvalflow-edit', 'approvalflow-view'));
$config->group->package->approvalflow->privs['approvalflow-edit'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 7, 'depend' => array('approvalflow-browse'), 'recommend' => array('approvalflow-create', 'approvalflow-delete', 'approvalflow-design', 'approvalflow-view'));
$config->group->package->approvalflow->privs['approvalflow-view'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('approvalflow-browse'), 'recommend' => array());
$config->group->package->approvalflow->privs['approvalflow-design'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 8, 'depend' => array('approvalflow-browse'), 'recommend' => array('approvalflow-create', 'approvalflow-delete', 'approvalflow-edit', 'approvalflow-view'));
$config->group->package->approvalflow->privs['approvalflow-delete'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 9, 'depend' => array('approvalflow-browse'), 'recommend' => array('approvalflow-create', 'approvalflow-design', 'approvalflow-edit', 'approvalflow-view'));
$config->group->package->approvalflow->privs['approvalflow-role'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 0, 'depend' => array(), 'recommend' => array());
$config->group->package->approvalflow->privs['approvalflow-createRole'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 1, 'depend' => array('approvalflow-role'), 'recommend' => array('approvalflow-deleteRole', 'approvalflow-editRole'));
$config->group->package->approvalflow->privs['approvalflow-editRole'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 2, 'depend' => array('approvalflow-role'), 'recommend' => array('approvalflow-createRole', 'approvalflow-deleteRole'));
$config->group->package->approvalflow->privs['approvalflow-deleteRole'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 3, 'depend' => array('approvalflow-role'), 'recommend' => array('approvalflow-createRole', 'approvalflow-editRole'));
$config->group->package->measurement = new stdclass();
$config->group->package->measurement->order = 15;
@@ -3054,20 +3054,20 @@ $config->group->package->measurement->privs['measurement-browse'] = arra
$config->group->package->measurement->privs['measurement-createBasic'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 2, 'depend' => array('measurement-browse'), 'recommend' => array('measurement-delete', 'measurement-editBasic', 'measurement-setSQL'));
$config->group->package->measurement->privs['measurement-delete'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 6, 'depend' => array('measurement-browse'), 'recommend' => array('measurement-batchEdit', 'measurement-createBasic', 'measurement-editBasic', 'measurement-setSQL'));
$config->group->package->measurement->privs['measurement-editBasic'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 4, 'depend' => array('measurement-browse'), 'recommend' => array('measurement-batchEdit', 'measurement-createBasic', 'measurement-delete', 'measurement-setSQL'));
$config->group->package->measurement->privs['measurement-searchMeas'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 14, 'depend' => array(), 'recommend' => array());
$config->group->package->measurement->privs['measurement-searchMeas'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 14, 'depend' => array('measurement-browse'), 'recommend' => array());
$config->group->package->measurement->privs['measurement-template'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 7, 'depend' => array(), 'recommend' => array());
$config->group->package->measurement->privs['measurement-createTemplate'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 23, 'depend' => array('measurement-template'), 'recommend' => array('measurement-editTemplate', 'measurement-viewTemplate'));
$config->group->package->measurement->privs['measurement-editTemplate'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 9, 'depend' => array(), 'recommend' => array('measurement-createTemplate', 'measurement-viewTemplate'));
$config->group->package->measurement->privs['measurement-viewTemplate'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 8, 'depend' => array(), 'recommend' => array());
$config->group->package->measurement->privs['measurement-editTemplate'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 9, 'depend' => array('measurement-template'), 'recommend' => array('measurement-createTemplate', 'measurement-viewTemplate'));
$config->group->package->measurement->privs['measurement-viewTemplate'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 8, 'depend' => array('measurement-template'), 'recommend' => array());
$config->group->package->measurement->privs['measurement-batchEdit'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('measurement-browse'), 'recommend' => array('measurement-editBasic'));
$config->group->package->measurement->privs['measurement-saveReport'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 24, 'depend' => array('measurement-viewTemplate'), 'recommend' => array());
$config->group->package->measurement->privs['report-custom'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 17, 'depend' => array(), 'recommend' => array());
$config->group->package->measurement->privs['report-editReport'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 18, 'depend' => array(), 'recommend' => array());
$config->group->package->measurement->privs['report-useReport'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 19, 'depend' => array(), 'recommend' => array());
$config->group->package->measurement->privs['report-deleteReport'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 20, 'depend' => array(), 'recommend' => array());
$config->group->package->measurement->privs['report-saveReport'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 21, 'depend' => array(), 'recommend' => array());
$config->group->package->measurement->privs['report-crystalExport'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 22, 'depend' => array(), 'recommend' => array());
$config->group->package->measurement->privs['report-export'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 25, 'depend' => array(), 'recommend' => array());
$config->group->package->measurement->privs['report-custom'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 17, 'depend' => array('measurement-template'), 'recommend' => array());
$config->group->package->measurement->privs['report-editReport'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 18, 'depend' => array('measurement-template'), 'recommend' => array());
$config->group->package->measurement->privs['report-useReport'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 19, 'depend' => array('measurement-template'), 'recommend' => array());
$config->group->package->measurement->privs['report-deleteReport'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 20, 'depend' => array('measurement-template'), 'recommend' => array());
$config->group->package->measurement->privs['report-saveReport'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 21, 'depend' => array('measurement-template'), 'recommend' => array());
$config->group->package->measurement->privs['report-crystalExport'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 22, 'depend' => array('measurement-template'), 'recommend' => array());
$config->group->package->measurement->privs['report-export'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 25, 'depend' => array('measurement-template'), 'recommend' => array());
$config->group->package->usercl = new stdclass();
$config->group->package->usercl->order = 25;