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

* Merge 18.9 group module.

Browse Source
This commit is contained in:
hufangzhou
2023-11-28 09:02:15 +08:00
parent 854131d705
commit f61672ccbc
8 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/lang/de.php
+6 -1
View File
@@ -204,6 +204,10 @@ $lang->group->versions['1_1'] = 'ZenTao1.1';
$lang->group->versions['1_0_1'] = 'ZenTao1.0.1';
$lang->group->package = new stdclass();
$lang->group->package->browse = 'Browse';
$lang->group->package->manage = 'Manage';
$lang->group->package->delete = 'Delete';
$lang->group->package->other = 'Other';
$lang->group->package->browseTodo = 'Browse Todo';
$lang->group->package->manageTodo = 'Manage Todo';
$lang->group->package->deleteTodo = 'Delete Todo';
@@ -467,7 +471,7 @@ $lang->group->package->process = 'Process';
$lang->group->package->activity = 'Activity';
$lang->group->package->zoutput = 'Zoutput';
$lang->group->package->custom = 'Custom';
$lang->group->package->cmcl = 'Cmcl';
$lang->group->package->approvalflow = 'Approval flow';
$lang->group->package->measurement = 'Measurement';
$lang->group->package->usercl = 'Usercl';
$lang->group->package->meetingroom = 'Meetingroom';
@@ -554,6 +558,7 @@ $lang->group->package->deleteRoadmap = 'Delete Roadmap';
$lang->group->package->deleteDemandPool = 'Delete Demand Pool';
$lang->group->package->exportDatatable = 'Export Datatable';
$lang->group->package->ai = 'AI';
$lang->group->package->aiChatting = 'AI Chat';
$lang->group->package->executePrompt = 'Execute Prompts';
$lang->group->package->manageLLM = 'Manage Models';
$lang->group->package->browsePrompt = 'Browse Prompts';
module/group/lang/en.php
+1
View File
@@ -558,6 +558,7 @@ $lang->group->package->deleteRoadmap = 'Delete Roadmap';
$lang->group->package->deleteDemandPool = 'Delete Demand Pool';
$lang->group->package->exportDatatable = 'Export Datatable';
$lang->group->package->ai = 'AI';
$lang->group->package->aiChatting = 'AI Chat';
$lang->group->package->executePrompt = 'Execute Prompts';
$lang->group->package->manageLLM = 'Manage Models';
$lang->group->package->browsePrompt = 'Browse Prompts';
module/group/lang/fr.php
+7 -2
View File
@@ -204,6 +204,10 @@ $lang->group->versions['1_1'] = 'ZenTao1.1';
$lang->group->versions['1_0_1'] = 'ZenTao1.0.1';
$lang->group->package = new stdclass();
$lang->group->package->browse = 'Browse';
$lang->group->package->manage = 'Manage';
$lang->group->package->delete = 'Delete';
$lang->group->package->other = 'Other';
$lang->group->package->browseTodo = 'Browse Todo';
$lang->group->package->manageTodo = 'Manage Todo';
$lang->group->package->deleteTodo = 'Delete Todo';
@@ -313,7 +317,7 @@ $lang->group->package->exportOffice = 'Export Office';
$lang->group->package->browseFeedback = 'Browse Feedback';
$lang->group->package->manageFeedback = 'Manage Feedback';
$lang->group->package->importFeedback = 'Import Feedback';
$lang->group->package->manageFeedback = 'Manage Feedback';
$lang->group->package->handleFeedback = 'Handle Feedback';
$lang->group->package->faq = 'Faq';
$lang->group->package->browseTicket = 'Browse Ticket';
$lang->group->package->manageTicket = 'Manage Ticket';
@@ -467,7 +471,7 @@ $lang->group->package->process = 'Process';
$lang->group->package->activity = 'Activity';
$lang->group->package->zoutput = 'Zoutput';
$lang->group->package->custom = 'Custom';
$lang->group->package->cmcl = 'Cmcl';
$lang->group->package->approvalflow = 'Approval flow';
$lang->group->package->measurement = 'Measurement';
$lang->group->package->usercl = 'Usercl';
$lang->group->package->meetingroom = 'Meetingroom';
@@ -554,6 +558,7 @@ $lang->group->package->deleteRoadmap = 'Delete Roadmap';
$lang->group->package->deleteDemandPool = 'Delete Demand Pool';
$lang->group->package->exportDatatable = 'Export Datatable';
$lang->group->package->ai = 'AI';
$lang->group->package->aiChatting = 'AI Chat';
$lang->group->package->executePrompt = 'Execute Prompts';
$lang->group->package->manageLLM = 'Manage Models';
$lang->group->package->browsePrompt = 'Browse Prompts';
module/group/lang/resource.php
+7 -4
View File
@@ -1311,8 +1311,8 @@ $lang->resource->repo->linkBug = 'linkBug';
$lang->resource->repo->linkTask = 'linkTask';
$lang->resource->repo->unlink = 'unlink';
$lang->resource->repo->import = 'importAction';
$lang->resource->repo->createBranch = 'createBranchAction';
$lang->resource->repo->createRepo = 'createRepoAction';
//$lang->resource->repo->createBranch = 'createBranchAction';
$lang->repo->methodOrder[5] = 'create';
$lang->repo->methodOrder[10] = 'edit';
@@ -1334,8 +1334,8 @@ $lang->repo->methodOrder[85] = 'linkBug';
$lang->repo->methodOrder[90] = 'linkTask';
$lang->repo->methodOrder[95] = 'unlink';
$lang->repo->methodOrder[100] = 'import';
$lang->repo->methodOrder[105] = 'createBranch';
$lang->repo->methodOrder[110] = 'createRepo';
$lang->repo->methodOrder[105] = 'createRepo';
//$lang->repo->methodOrder[110] = 'createBranch';
$lang->resource->ci = new stdclass();
$lang->resource->ci->commitResult = 'commitResult';
@@ -1430,7 +1430,7 @@ $lang->resource->doc->myEdited = 'myEdited';
$lang->resource->doc->createLib = 'createLib';
$lang->resource->doc->editLib = 'editLib';
$lang->resource->doc->deleteLib = 'deleteLib';
$lang->resource->doc->create = 'create';
$lang->resource->doc->create = 'createOrUpload';
$lang->resource->doc->edit = 'edit';
$lang->resource->doc->view = 'view';
$lang->resource->doc->delete = 'delete';
@@ -1445,6 +1445,7 @@ $lang->resource->doc->editCatalog = 'editCatalog';
$lang->resource->doc->sortCatalog = 'sortCatalog';
$lang->resource->doc->deleteCatalog = 'deleteCatalog';
$lang->resource->doc->displaySetting = 'displaySetting';
$lang->resource->doc->exportFiles = 'exportFiles';
$lang->doc->methodOrder[5] = 'index';
$lang->doc->methodOrder[10] = 'mySpace';
@@ -1470,6 +1471,7 @@ $lang->doc->methodOrder[105] = 'editCatalog';
$lang->doc->methodOrder[110] = 'sortCatalog';
$lang->doc->methodOrder[115] = 'deleteCatalog';
$lang->doc->methodOrder[120] = 'displaySetting';
$lang->doc->methodOrder[125] = 'exportFiles';
/* Mail. */
$lang->resource->mail = new stdclass();
@@ -1889,6 +1891,7 @@ $lang->resource->ai->prompts = 'promptBrowse';
$lang->resource->ai->promptView = 'promptView';
$lang->resource->ai->promptExecute = 'promptExecute';
$lang->resource->ai->promptExecutionReset = 'promptExecutionReset';
$lang->resource->ai->chat = 'chat';
$lang->api->methodOrder[0] = 'index';
$lang->api->methodOrder[5] = 'createLib';
module/group/lang/zh-cn.php
+1
View File
@@ -558,6 +558,7 @@ $lang->group->package->deleteRoadmap = '删除产品路标';
$lang->group->package->deleteDemandPool = '删除需求池';
$lang->group->package->exportDatatable = '导出数据表';
$lang->group->package->ai = 'AI';
$lang->group->package->aiChatting = 'AI 聊天';
$lang->group->package->executePrompt = '执行提词';
$lang->group->package->manageLLM = '语言模型管理';
$lang->group->package->browsePrompt = '浏览提词';
module/group/model.php
+1 -1
View File
@@ -1848,7 +1848,7 @@ class groupModel extends model
/* If version is selected, only show privs before the version. */
if(!empty($version) and strpos($versionPrivs, ",$privCode,") === false) continue;
/* Remove privs unused in the edition. */
/* Add methods in workflow menus, remove privs unused in the edition. */
if(isset($this->lang->$moduleName->menus) && isset($this->lang->$moduleName->menus[$methodName]))
{
$privName = $this->lang->$moduleName->menus[$methodName];
module/group/packagemanager.php
+15 -8
View File
@@ -651,7 +651,7 @@ $config->group->package->createProduct->privs['product-edit'] = array('ed
$config->group->package->createProduct->privs['product-batchEdit'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,or', 'order' => 35, 'depend' => array('product-all'), 'recommend' => array('product-edit'));
$config->group->package->createProduct->privs['product-close'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,or', 'order' => 70, 'depend' => array('product-view'), 'recommend' => array('product-create', 'product-edit'));
$config->group->package->createProduct->privs['product-updateOrder'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,or', 'order' => 75, 'depend' => array('product-all'), 'recommend' => array('product-create', 'product-edit'));
$config->group->package->createProduct->privs['product-activate'] = array('edition' => 'ipd', 'vision' => 'or,rnd', 'order' => 10, 'depend' => array(), 'recommend' => array());
$config->group->package->createProduct->privs['product-activate'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'or,rnd', 'order' => 10, 'depend' => array(), 'recommend' => array());
$config->group->package->importProduct = new stdclass();
$config->group->package->importProduct->order = 20;
@@ -3192,7 +3192,7 @@ $config->group->package->track = new stdclass();
$config->group->package->track->order = 5;
$config->group->package->track->subset = 'projecttrack';
$config->group->package->track->privs = array();
$config->group->package->track->privs['projectstory-track'] = array('edition' => 'max', 'vision' => 'rnd', 'order' => 10, 'depend' => array('project-index'), 'recommend' => array('design-revision', 'projectstory-story', 'projectstory-view'));
$config->group->package->track->privs['projectstory-track'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array('project-index'), 'recommend' => array('design-revision', 'projectstory-story', 'projectstory-view'));
$config->group->package->workflowRelation = new stdclass();
$config->group->package->workflowRelation->order = 65;
@@ -3538,10 +3538,11 @@ $config->group->package->exportDoc = new stdclass();
$config->group->package->exportDoc->order = 25;
$config->group->package->exportDoc->subset = 'doc';
$config->group->package->exportDoc->privs = array();
$config->group->package->exportDoc->privs['doc-mine2export'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite', 'order' => 125, 'depend' => array('doc-mySpace'), 'recommend' => array());
$config->group->package->exportDoc->privs['doc-product2export'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite', 'order' => 130, 'depend' => array('doc-productSpace'), 'recommend' => array());
$config->group->package->exportDoc->privs['doc-mine2export'] = array('edition' => 'biz,max,ipd', 'vision' => 'or,rnd,lite', 'order' => 125, 'depend' => array('doc-mySpace'), 'recommend' => array());
$config->group->package->exportDoc->privs['doc-product2export'] = array('edition' => 'biz,max,ipd', 'vision' => 'or,rnd,lite', 'order' => 130, 'depend' => array('doc-productSpace'), 'recommend' => array());
$config->group->package->exportDoc->privs['doc-project2export'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite', 'order' => 135, 'depend' => array('doc-projectSpace'), 'recommend' => array());
$config->group->package->exportDoc->privs['doc-custom2export'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd,lite', 'order' => 140, 'depend' => array('doc-teamSpace'), 'recommend' => array());
$config->group->package->exportDoc->privs['doc-custom2export'] = array('edition' => 'biz,max,ipd', 'vision' => 'or,rnd,lite', 'order' => 140, 'depend' => array('doc-teamSpace'), 'recommend' => array());
$config->group->package->exportDoc->privs['doc-exportFiles'] = array('edition' => 'biz,max,ipd', 'vision' => 'or,rnd,lite', 'order' => 145, 'depend' => array('doc-showFiles'), 'recommend' => array());
$config->group->package->browseAPI = new stdclass();
$config->group->package->browseAPI->order = 5;
@@ -3748,6 +3749,12 @@ $config->group->package->exportDatatable->subset = 'dataview';
$config->group->package->exportDatatable->privs = array();
$config->group->package->exportDatatable->privs['dataview-export'] = array('edition' => 'biz,max,ipd', 'vision' => 'rnd', 'order' => 30, 'depend' => array('dataview-browse', 'dataview-query'), 'recommend' => array());
$config->group->package->aiChatting = new stdclass();
$config->group->package->aiChatting->order = 2020;
$config->group->package->aiChatting->subset = 'ai';
$config->group->package->aiChatting->privs = array();
$config->group->package->aiChatting->privs['ai-chat'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 10, 'depend' => array(), 'recommend' => array());
$config->group->package->executePrompt = new stdclass();
$config->group->package->executePrompt->order = 2040;
$config->group->package->executePrompt->subset = 'ai';
@@ -3759,9 +3766,9 @@ $config->group->package->manageLLM = new stdclass();
$config->group->package->manageLLM->order = 2060;
$config->group->package->manageLLM->subset = 'ai';
$config->group->package->manageLLM->privs = array();
$config->group->package->manageLLM->privs['ai-models'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('admin-index'), 'recommend' => array());
$config->group->package->manageLLM->privs['ai-editModel'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 10, 'depend' => array('admin-index', 'ai-models', 'ai-testConnection'), 'recommend' => array());
$config->group->package->manageLLM->privs['ai-testConnection'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd', 'order' => 15, 'depend' => array('admin-index', 'ai-editModel', 'ai-models'), 'recommend' => array());
$config->group->package->manageLLM->privs['ai-models'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 5, 'depend' => array('admin-index'), 'recommend' => array());
$config->group->package->manageLLM->privs['ai-editModel'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 10, 'depend' => array('admin-index', 'ai-models', 'ai-testConnection'), 'recommend' => array());
$config->group->package->manageLLM->privs['ai-testConnection'] = array('edition' => 'open,biz,max,ipd', 'vision' => 'rnd,lite,or', 'order' => 15, 'depend' => array('admin-index', 'ai-editModel', 'ai-models'), 'recommend' => array());
$config->group->package->browsePrompt = new stdclass();
$config->group->package->browsePrompt->order = 2080;
module/group/zen.php
-16
View File
@@ -140,22 +140,6 @@ class groupZen extends group
}
}
/* Subsets in resource but not in package. */
$this->group->sortResource();
foreach($this->lang->resource as $module => $methodList)
{
foreach($methodList as $method => $methodLang)
{
if(isset($privs["$module-$method"])) continue;
if(!isset($subsets[$module]))
{
$subsets[$module] = isset($this->lang->$module) && isset($this->lang->$module->common) ? $this->lang->$module->common : $module;
$packages[$module] = array('other' => $this->lang->group->other);
}
}
}
$this->view->title = $this->lang->company->common . $this->lang->colon . $this->lang->group->managePriv;
$this->view->groups = $this->group->getPairs();
$this->view->subsets = $subsets;