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

Merge branch feature/workflowgroup of zentao/zentaopms (#10930)

Browse Source
This commit is contained in:
刘刚
2025-08-14 10:27:44 +08:00
committed by Gitfox
parent 7cdbc3a9ac 4e2c9f4e9d
commit c24fcd3c95
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update22.0.sql
+5
View File
@@ -19,3 +19,8 @@ ALTER TABLE `zt_module` ADD `extra` varchar(30) NOT NULL DEFAULT '';
ALTER TABLE `zt_process` ADD `workflowGroup` mediumint(8) unsigned NOT NULL DEFAULT '0' AFTER `id`;
ALTER TABLE `zt_process` ADD `module` int(8) unsigned NOT NULL DEFAULT '0' AFTER `name`;
ALTER TABLE `zt_activity` ADD `workflowGroup` mediumint(8) unsigned NOT NULL DEFAULT '0' AFTER `process`;
UPDATE `zt_process` SET `editedDate` = NULL WHERE `editedDate` LIKE '1970-01-01%';
UPDATE `zt_process` SET `assignedDate` = NULL WHERE `assignedDate` LIKE '1970-01-01%';
UPDATE `zt_activity` SET `editedDate` = NULL WHERE `editedDate` LIKE '1970-01-01%';
UPDATE `zt_activity` SET `assignedDate` = NULL WHERE `assignedDate` LIKE '1970-01-01%';
lib/zin/wg/deliverable/css/v1.css
+2 -1
View File
@@ -1,2 +1,3 @@
.deliverable-category-name>.text:after { right: -0.5rem !important; }
.deliverable-item .form-tip { padding-left: 0.5rem }
.deliverable-item .form-tip { padding-left: 0.5rem; }
.deliverable-item-doc-picker { width: 18rem; }
lib/zin/wg/deliverable/v1.php
+3 -2
View File
@@ -71,6 +71,7 @@ class deliverable extends wg
$onlyShow = $this->prop('onlyShow') ? $this->prop('onlyShow') : false;
$extraCategory = $this->prop('extraCategory') ? $this->prop('extraCategory') : array_column($this->prop('items'), 'category');
$categories = $this->prop('categories');
$projectID = $this->prop('projectID');
jsVar('addFile', $isTemplate ? $lang->deliverable->files : $lang->doc->addFile);
jsVar('isTemplate', $isTemplate);
@@ -85,8 +86,8 @@ class deliverable extends wg
$this->setProp('maxFileSize', $maxFileSize);
}
$selectDocTips = $isTemplate ? $lang->deliverable->selectDoc : $lang->doc->selectDoc;
$docLink = $isTemplate ? helper::createLink('doc', 'ajaxGetTemplateDocs', 'keyword={search}') : helper::createLink('doc', 'ajaxGetMineDocs', 'keyword={search}');
$selectDocTips = $isTemplate ? $lang->deliverable->selectDoc : $lang->deliverable->selectDocInProject;
$docLink = $isTemplate ? helper::createLink('doc', 'ajaxGetTemplateDocs', "keyword={search}") : helper::createLink('doc', 'ajaxGetDeliverableDocs', "keyword={search}&projectID={$projectID}");
return zui::deliverableList
(
module/group/packagemanager.php
+7 -7
View File
@@ -3116,14 +3116,14 @@ $config->group->package->process = new stdclass();
$config->group->package->process->order = 25;
$config->group->package->process->subset = 'featureconfig';
$config->group->package->process->privs = array();
$config->group->package->process->privs['process-create'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array(), 'recommend' => array('process-batchCreate', 'process-delete', 'process-edit', 'process-updateOrder', 'process-view'));
$config->group->package->process->privs['process-batchCreate'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 6, 'depend' => array(), 'recommend' => array('process-create'));
$config->group->package->process->privs['process-delete'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 8, 'depend' => array(), 'recommend' => array('process-create'));
$config->group->package->process->privs['process-edit'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 7, 'depend' => array(), 'recommend' => array('process-create', 'process-delete', 'process-updateOrder', 'process-view'));
$config->group->package->process->privs['process-view'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 4, 'depend' => array(), 'recommend' => array());
$config->group->package->process->privs['process-updateOrder'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 9, 'depend' => array(), 'recommend' => array('process-create', 'process-edit'));
$config->group->package->process->privs['process-create'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 5, 'depend' => array('process-browse'), 'recommend' => array('process-batchCreate', 'process-delete', 'process-edit', 'process-updateOrder', 'process-view'));
$config->group->package->process->privs['process-batchCreate'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 6, 'depend' => array('process-browse'), 'recommend' => array('process-create'));
$config->group->package->process->privs['process-delete'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 8, 'depend' => array('process-browse'), 'recommend' => array('process-create'));
$config->group->package->process->privs['process-edit'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 7, 'depend' => array('process-browse'), 'recommend' => array('process-create', 'process-delete', 'process-updateOrder', 'process-view'));
$config->group->package->process->privs['process-view'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 4, 'depend' => array('process-browse'), 'recommend' => array());
$config->group->package->process->privs['process-updateOrder'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 9, 'depend' => array('process-browse'), 'recommend' => array('process-create', 'process-edit'));
$config->group->package->process->privs['process-browse'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 1, 'depend' => array(), 'recommend' => array());
$config->group->package->process->privs['process-manageModule'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 11, 'depend' => array(), 'recommend' => array());
$config->group->package->process->privs['process-manageModule'] = array('edition' => 'max,ipd', 'vision' => 'rnd', 'order' => 11, 'depend' => array('process-browse'), 'recommend' => array());
$config->group->package->activity = new stdclass();
$config->group->package->activity->order = 35;