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

* [task#146637,done,3h,0h] Add isDeliverable field to template doc.

Browse Source
This commit is contained in:
wangyuting
2025-07-16 16:02:08 +08:00
parent 6b96580e90
commit 27f3e16083
9 changed files with 79 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
db/update21.7.3.sql
+3 -1
View File
@@ -66,4 +66,6 @@ SET `bug`.`identify` = 'requirement'
WHERE `bug`.`identify` != 0 AND `object`.`category` NOT IN ('HLDS', 'DDS', 'DBDS', 'ADS', 'QAP', 'CMP', 'ITP', 'ITTC', 'STP', 'STTC', 'UM');
UPDATE `zt_bug` SET `injection` = '' WHERE `injection` = '0';
UPDATE `zt_bug` SET `identify` = '' WHERE `identify` = '0';
UPDATE `zt_bug` SET `identify` = '' WHERE `identify` = '0';
ALTER TABLE `zt_doc` ADD `isDeliverable` char(10) NOT NULL DEFAULT 'no' AFTER `acl`;
db/zentao.sql
+1
View File
@@ -837,6 +837,7 @@ CREATE TABLE IF NOT EXISTS `zt_doc` (
`editedList` text NULL,
`mailto` text NULL,
`acl` varchar(10) NOT NULL DEFAULT 'open',
`isDeliverable` char(10) NOT NULL DEFAULT 'no',
`groups` varchar(255) NOT NULL DEFAULT '',
`users` text NULL,
`readGroups` varchar(255) NOT NULL DEFAULT '',
module/doc/config/form.php
+29 -28
View File
@@ -34,34 +34,35 @@ $config->doc->form->editlib['acl'] = array('type' => 'string', 'required'
$config->doc->form->editlib['groups'] = array('type' => 'array', 'required' => false, 'default' => '', 'filter' => 'join');
$config->doc->form->editlib['users'] = array('type' => 'array', 'required' => false, 'default' => '', 'filter' => 'join');
$config->doc->form->create['title'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->doc->form->create['version'] = array('type' => 'int', 'required' => false, 'default' => 1);
$config->doc->form->create['product'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->doc->form->create['project'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->doc->form->create['execution'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->doc->form->create['module'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->doc->form->create['lib'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->doc->form->create['status'] = array('type' => 'string', 'required' => false, 'default' => 'normal');
$config->doc->form->create['parent'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->doc->form->create['type'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->doc->form->create['keywords'] = array('type' => 'string', 'required' => false, 'default' => '', 'skipRequired' => true);
$config->doc->form->create['acl'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->doc->form->create['vision'] = array('type' => 'string', 'required' => false, 'default' => $config->vision);
$config->doc->form->create['addedBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->doc->form->create['addedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->doc->form->create['editedBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->doc->form->create['editedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->doc->form->create['groups'] = array('type' => 'array', 'required' => false, 'default' => '', 'filter' => 'join');
$config->doc->form->create['users'] = array('type' => 'array', 'required' => false, 'default' => '', 'filter' => 'join');
$config->doc->form->create['readGroups'] = array('type' => 'array', 'required' => false, 'default' => '', 'filter' => 'join');
$config->doc->form->create['readUsers'] = array('type' => 'array', 'required' => false, 'default' => '', 'filter' => 'join');
$config->doc->form->create['mailto'] = array('type' => 'array', 'required' => false, 'default' => '', 'filter' => 'join');
$config->doc->form->create['contentType'] = array('type' => 'string', 'required' => false, 'default' => 'doc');
$config->doc->form->create['content'] = array('type' => 'string', 'required' => false, 'default' => '', 'control' => 'editor', 'skipRequired' => true);
$config->doc->form->create['rawContent'] = array('type' => 'string', 'required' => false, 'default' => '', 'skipRequired' => true, 'specialchars' => 'no');
$config->doc->form->create['template'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->doc->form->create['templateType'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->doc->form->create['chapterType'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->doc->form->create['title'] = array('type' => 'string', 'required' => true, 'default' => '', 'filter' => 'trim');
$config->doc->form->create['version'] = array('type' => 'int', 'required' => false, 'default' => 1);
$config->doc->form->create['product'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->doc->form->create['project'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->doc->form->create['execution'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->doc->form->create['module'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->doc->form->create['lib'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->doc->form->create['status'] = array('type' => 'string', 'required' => false, 'default' => 'normal');
$config->doc->form->create['parent'] = array('type' => 'int', 'required' => false, 'default' => 0);
$config->doc->form->create['type'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->doc->form->create['keywords'] = array('type' => 'string', 'required' => false, 'default' => '', 'skipRequired' => true);
$config->doc->form->create['acl'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->doc->form->create['vision'] = array('type' => 'string', 'required' => false, 'default' => $config->vision);
$config->doc->form->create['addedBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->doc->form->create['addedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->doc->form->create['editedBy'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->doc->form->create['editedDate'] = array('type' => 'datetime', 'required' => false, 'default' => $now);
$config->doc->form->create['groups'] = array('type' => 'array', 'required' => false, 'default' => '', 'filter' => 'join');
$config->doc->form->create['users'] = array('type' => 'array', 'required' => false, 'default' => '', 'filter' => 'join');
$config->doc->form->create['readGroups'] = array('type' => 'array', 'required' => false, 'default' => '', 'filter' => 'join');
$config->doc->form->create['readUsers'] = array('type' => 'array', 'required' => false, 'default' => '', 'filter' => 'join');
$config->doc->form->create['mailto'] = array('type' => 'array', 'required' => false, 'default' => '', 'filter' => 'join');
$config->doc->form->create['contentType'] = array('type' => 'string', 'required' => false, 'default' => 'doc');
$config->doc->form->create['content'] = array('type' => 'string', 'required' => false, 'default' => '', 'control' => 'editor', 'skipRequired' => true);
$config->doc->form->create['rawContent'] = array('type' => 'string', 'required' => false, 'default' => '', 'skipRequired' => true, 'specialchars' => 'no');
$config->doc->form->create['template'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->doc->form->create['templateType'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->doc->form->create['chapterType'] = array('type' => 'string', 'required' => false, 'default' => '');
$config->doc->form->create['isDeliverable'] = array('type' => 'string', 'required' => false, 'default' => 'no');
$config->doc->form->createtemplate = $config->doc->form->create;
$config->doc->form->createtemplate['templateDesc'] = array('type' => 'string', 'required' => false, 'default' => '');
module/doc/js/setdocbasic.ui.js
+17
View File
@@ -28,3 +28,20 @@ window.loadExecutions = function()
modulePicker.$.setValue('');
});
}
window.changeIsDeliverable = function()
{
if($(this).val() == 'yes')
{
$('[name=acl]').attr('disabled', 'disabled');
$('[name=acl]').val('open');
$('[name=acl]').closest('.radio-primary').addClass('disabled');
$('[name=acl]').closest('.check-list').addClass('disabled');
}
else
{
$('[name=acl]').removeAttr('disabled');
$('[name=acl]').closest('.radio-primary').removeClass('disabled');
$('[name=acl]').closest('.check-list').removeClass('disabled');
}
}
module/doc/lang/de.php
+4
View File
@@ -88,6 +88,7 @@ $lang->docTemplate->scope = 'Scope';
$lang->docTemplate->lib = $lang->docTemplate->scope;
$lang->docTemplate->module = 'Category';
$lang->docTemplate->desc = 'Describe';
$lang->docTemplate->deliverable = 'Is Deliverable';
$lang->docTemplate->parentModule = 'Parent';
$lang->docTemplate->typeName = 'Category Name';
$lang->docTemplate->parent = 'Level';
@@ -141,6 +142,9 @@ $lang->docTemplate->filterTypes[] = array('draft', 'Draft');
$lang->docTemplate->filterTypes[] = array('released', 'Released');
$lang->docTemplate->filterTypes[] = array('createdByMe', 'Created By Me');
$lang->docTemplate->deliverableList['yes'] = 'Yes';
$lang->docTemplate->deliverableList['no'] = 'No';
/* Fields. */
$lang->doc->common = 'Dok';
$lang->doc->id = 'ID';
module/doc/lang/en.php
+4
View File
@@ -88,6 +88,7 @@ $lang->docTemplate->scope = 'Scope';
$lang->docTemplate->lib = $lang->docTemplate->scope;
$lang->docTemplate->module = 'Category';
$lang->docTemplate->desc = 'Describe';
$lang->docTemplate->deliverable = 'Is Deliverable';
$lang->docTemplate->parentModule = 'Parent';
$lang->docTemplate->typeName = 'Category Name';
$lang->docTemplate->parent = 'Level';
@@ -141,6 +142,9 @@ $lang->docTemplate->filterTypes[] = array('draft', 'Draft');
$lang->docTemplate->filterTypes[] = array('released', 'Released');
$lang->docTemplate->filterTypes[] = array('createdByMe', 'Created By Me');
$lang->docTemplate->deliverableList['yes'] = 'Yes';
$lang->docTemplate->deliverableList['no'] = 'No';
/* Fields. */
$lang->doc->common = 'Document';
$lang->doc->id = 'ID';
module/doc/lang/fr.php
+4
View File
@@ -88,6 +88,7 @@ $lang->docTemplate->scope = 'Scope';
$lang->docTemplate->lib = $lang->docTemplate->scope;
$lang->docTemplate->module = 'Category';
$lang->docTemplate->desc = 'Describe';
$lang->docTemplate->deliverable = 'Is Deliverable';
$lang->docTemplate->parentModule = 'Parent';
$lang->docTemplate->typeName = 'Category Name';
$lang->docTemplate->parent = 'Level';
@@ -141,6 +142,9 @@ $lang->docTemplate->filterTypes[] = array('draft', 'Draft');
$lang->docTemplate->filterTypes[] = array('released', 'Released');
$lang->docTemplate->filterTypes[] = array('createdByMe', 'Created By Me');
$lang->docTemplate->deliverableList['yes'] = 'Yes';
$lang->docTemplate->deliverableList['no'] = 'No';
/* Fields. */
$lang->doc->common = 'Gestion Documentaire';
$lang->doc->id = 'ID';
module/doc/lang/zh-cn.php
+4
View File
@@ -88,6 +88,7 @@ $lang->docTemplate->scope = '所属范围';
$lang->docTemplate->lib = $lang->docTemplate->scope;
$lang->docTemplate->module = '模板分类';
$lang->docTemplate->desc = '描述';
$lang->docTemplate->deliverable = '是否为交付物';
$lang->docTemplate->parentModule = '上级分类';
$lang->docTemplate->typeName = '分类名称';
$lang->docTemplate->parent = '所属层级';
@@ -141,6 +142,9 @@ $lang->docTemplate->filterTypes[] = array('draft', '草稿');
$lang->docTemplate->filterTypes[] = array('released', '已发布');
$lang->docTemplate->filterTypes[] = array('createdByMe', '我创建的');
$lang->docTemplate->deliverableList['yes'] = '是';
$lang->docTemplate->deliverableList['no'] = '否';
/* 字段列表。*/
$lang->doc->common = '文档';
$lang->doc->id = 'ID';
module/doc/ui/setdocbasic.template.html.php
+13
View File
@@ -26,6 +26,7 @@ formPanel
set::title($title),
set::submitBtnText($lang->save),
on::change('[name=lib]')->call('loadScopeTypes', jsRaw("event")),
on::change('[name=isDeliverable]', 'window.changeIsDeliverable'),
set::ajax(array('beforeSubmit' => jsRaw('window.beforeSetDocBasicInfo'))),
formGroup
(
@@ -62,6 +63,17 @@ formPanel
set::label($lang->docTemplate->desc),
textarea(set::name('templateDesc'), set::value($docID ? $doc->templateDesc : ''), set::rows(3))
) : null,
$modalType != 'chapter' && in_array($config->edition, array('max', 'ipd')) ? formGroup
(
set::label($lang->docTemplate->deliverable),
radioList
(
set::inline(true),
set::name('isDeliverable'),
set::items($lang->docTemplate->deliverableList),
set::value($docID ? $doc->isDeliverable : 'no')
)
) : null,
empty($parentID) ? formGroup
(
set::label($lang->doclib->control),
@@ -69,6 +81,7 @@ formPanel
(
setClass($objectType == 'mine' ? 'pointer-events-none' : ''),
set::name('acl'),
set::disabled($docID && $doc->isDeliverable == 'yes' ? true : false),
set::items($lang->doc->aclListA),
set::value(isset($doc) ? $doc->acl : 'open')
)