 刘刚
|
a4334f2a8a
|
Merge branch ztflow-xieqiyu-feature/doctemplate#xieqiyu of zentao/zentaopms (#9504)
|
2025-06-13 14:56:33 +08:00 |
|
|
xieqiyu
|
c5d6609bb9
|
Merge branch 'dev/task-144512' into feature/doctemplate
|
2025-06-13 06:21:59 +00:00 |
|
|
xieqiyu
|
d868d1f681
|
* [unittest] Modify the unit test file of docModel::upgradeTemplateLibAndModule.
|
2025-06-13 05:54:04 +00:00 |
|
|
xieqiyu
|
a96caf8fe9
|
* [unittest] Modify the unit test file of template yaml.
|
2025-06-13 05:39:44 +00:00 |
|
|
xieqiyu
|
57651cf498
|
* [task#144512,doing,0.5h] Format time field when upgrade doc template.
|
2025-06-13 02:03:07 +00:00 |
|
|
刘刚
|
7a8c571076
|
Merge branch ztflow-daitingting-feature/doctemplate#daitingting of zentao/zentaopms (#9491)
|
2025-06-13 09:43:06 +08:00 |
|
|
daitingting
|
73664f87b8
|
Merge branch 'dev/task-144514' into feature/doctemplate
|
2025-06-13 01:26:07 +00:00 |
|
|
刘刚
|
9f709a95a0
|
Merge branch dev/task-144522 of zentao/zentaopms (#9483)
|
2025-06-13 08:54:53 +08:00 |
|
|
刘刚
|
b490813bf5
|
Merge branch dev/task-144644 of zentao/zentaopms (#9479)
|
2025-06-12 17:30:03 +08:00 |
|
|
刘刚
|
720c088dd3
|
Merge branch ztflow-daitingting-dev/task-144644#daitingting of zentao/zentaopms (#9477)
|
2025-06-12 17:26:22 +08:00 |
|
|
daitingting
|
658570a1b8
|
* [task#144644,done,2h] Set showWhen for zentao list menus.
|
2025-06-12 16:51:43 +08:00 |
|
|
daitingting
|
9b9355ef7c
|
* [task#144644,doing,2h] Get project review templates.
|
2025-06-12 16:51:09 +08:00 |
|
|
刘刚
|
390b6e7610
|
Merge branch ztflow-xieqiyu-dev/task-144522#xieqiyu of zentao/zentaopms (#9452)
|
2025-06-12 14:33:17 +08:00 |
|
|
xieqiyu
|
765990a94c
|
* [task#144522,doing,1h] Show the template from review.
|
2025-06-12 14:16:04 +08:00 |
|
|
刘刚
|
66ba325e4e
|
Merge branch dev/task-144513 of zentao/zentaopms (#9400)
|
2025-06-11 13:38:24 +08:00 |
|
|
刘刚
|
af264a33e3
|
Merge branch ztflow-xieqiyu-dev/task-144513#xieqiyu of zentao/zentaopms (#9390)
|
2025-06-11 13:18:01 +08:00 |
|
|
xieqiyu
|
84e73fdaa9
|
* [task#144513,doing,0.5h] Modify the fail unit test of docModel::upgradeTemplateTypes.
|
2025-06-11 10:45:07 +08:00 |
|
|
xieqiyu
|
bfa830d21b
|
* [task#144513,doing,0.5h] Move the sql to 21.7.2.
|
2025-06-11 10:33:46 +08:00 |
|
|
xieqiyu
|
3953fb3ae1
|
* [task#144513,doing,0.5h] Modify the fail unit test of docModel::upgradeTemplateTypes.
|
2025-06-11 10:15:32 +08:00 |
|
|
xieqiyu
|
9d8ab44fcf
|
* [task#144513,doing,0.5h] Modify the fail unit test of upgradeModel::addBuiltInDocTemplate.
|
2025-06-11 09:47:46 +08:00 |
|
|
xieqiyu
|
a2f2ce7e31
|
* [task$144513,doing,0.5h] Modify the fail unit test of docModel::addBuiltInDocTemplateByType.
|
2025-06-11 09:40:16 +08:00 |
|
|
xieqiyu
|
73648d9501
|
* [task#144513,doing,0.5h] Optimize the code for setItem and getItem.
|
2025-06-11 09:06:03 +08:00 |
|
|
xieqiyu
|
35329dee3f
|
* [task#144513,doing,2h] Save the template with blocks into projectReviewDocTemplate for project review.
|
2025-06-11 09:05:44 +08:00 |
|
|
刘刚
|
99804defcf
|
Merge branch dev/task-144512 of zentao/zentaopms (#9363)
|
2025-06-11 08:54:47 +08:00 |
|
|
刘刚
|
7a7d99a184
|
Merge branch ztflow-xieqiyu-dev/task-144512#xieqiyu of zentao/zentaopms (#9355)
|
2025-06-10 16:24:02 +08:00 |
|
|
xieqiyu
|
74045b98cc
|
* [misc] Delete unused code.
|
2025-06-10 15:23:50 +08:00 |
|
|
刘刚
|
7d3ba4533a
|
Merge branch ztflow-daitingting-dev/task-144514#daitingting of zentao/zentaopms (#9351)
|
2025-06-10 15:13:47 +08:00 |
|
|
daitingting
|
5e2d3af396
|
* [task#144514,done,0.5h] Adjust checkpriv test.
|
2025-06-10 07:01:05 +00:00 |
|
|
daitingting
|
ee599e9451
|
* [task#144514,done,0.1h] Generate user data.
|
2025-06-10 06:53:00 +00:00 |
|
|
daitingting
|
576c79e63d
|
* [task#144514,done,0.5h] Add test items.
|
2025-06-10 06:46:27 +00:00 |
|
|
daitingting
|
7221aa9bed
|
* [task#144514,done,0.5h] Add setDocPriv test.
|
2025-06-10 06:37:13 +00:00 |
|
|
xieqiyu
|
15c9529833
|
* [task#144512,doing,0.5h] Add the unit test file of docModel::addBuiltInDocTemplateType.
|
2025-06-10 14:13:21 +08:00 |
|
|
xieqiyu
|
13638ed0ba
|
* [task#144512] Add the unit test file of upgradeModel::addBuiltInDocTemplate.
|
2025-06-10 14:03:43 +08:00 |
|
|
xieqiyu
|
9602daa7ef
|
* [task#144512,doing,0.5h] Add the unit test of upgradeModel::addBuiltInDocTemplate.
|
2025-06-10 14:02:49 +08:00 |
|
|
daitingting
|
3e9ce80a87
|
* [task#144514,done,0.1h] CreateTemplate priviledge do not depend on editTemplate priviledge.
|
2025-06-10 05:56:47 +00:00 |
|
|
daitingting
|
0bdf1c2ae2
|
* [task#144514,doing,0.1h] Users with createTemplate has editTemplate priviledge.
|
2025-06-10 05:55:11 +00:00 |
|
|
daitingting
|
6030f32053
|
* [task#144514,doing,0.5h] Author and users whith editTemplate priviledge can edit templates.
|
2025-06-10 05:54:11 +00:00 |
|
|
daitingting
|
58a201c305
|
* [task#144514,doing,0.5h] User with editTemplate priviledge can edit open templates.
|
2025-06-10 05:50:57 +00:00 |
|
|
daitingting
|
2b178b48ae
|
* [task#144514,doing, 0.1h] Check createTemplate priviledge when visit editTemplate.
|
2025-06-10 05:50:13 +00:00 |
|
|
daitingting
|
e4a272478d
|
* [task#144514,doing,0.5h] Disabled edit button in view page.
|
2025-06-10 05:44:51 +00:00 |
|
|
xieqiyu
|
86dce76a52
|
* [task#144512,doing,2h] Add built-in doc template by type.
|
2025-06-10 13:35:06 +08:00 |
|
|
xieqiyu
|
6d00f4fec7
|
* [task#144512,doing,2h] Get the type of template without system data.
|
2025-06-10 13:32:26 +08:00 |
|
|
刘刚
|
c3df2fe832
|
Merge branch dev/task-144515 of zentao/zentaopms (#9314)
|
2025-06-10 09:05:47 +08:00 |
|
|
刘刚
|
2026b014a4
|
Merge branch dev/task-144516 of zentao/zentaopms (#9312)
|
2025-06-10 09:05:38 +08:00 |
|
|
刘刚
|
c4cf139499
|
Merge branch ztflow-daitingting-dev/task-144516#daitingting of zentao/zentaopms (#9304)
|
2025-06-10 08:49:39 +08:00 |
|
|
刘刚
|
ac265a2255
|
Merge branch dev/task-144510 of zentao/zentaopms (#9303)
|
2025-06-10 08:49:04 +08:00 |
|
|
daitingting
|
d245453b3a
|
* [task#144516,done,0.5h] Remove white list box.
|
2025-06-09 11:37:45 +00:00 |
|
|
daitingting
|
67291a7c23
|
* [task#144516,doing,0.5h] Do not update white list for child template.
|
2025-06-09 11:36:56 +00:00 |
|
|
daitingting
|
0c10054a15
|
* [task#144516,doing,0.1h] Adjust private template tip.
|
2025-06-09 11:35:29 +00:00 |
|
|
daitingting
|
4e3ef79d93
|
* [task#144516,doing,0.5h] Remove groups and readers when create,edit,move template.
|
2025-06-09 11:34:15 +00:00 |
|