Commit Graph
716 Commits
Author SHA1 Message Date
zenggang 29f2f5187b * Merge 18.x 2023-08-28 10:27:22 +00:00
zenggang fdd027a824 * Merged 18.x 2023-08-28 09:30:26 +00:00
tanghucheng 78e10c3434 * Fix bug #37461. 2023-08-21 10:09:46 +08:00
hufangzhou ef5f6ca49e * Code for bug #37353. 2023-08-18 08:47:55 +08:00
leiyong e9061c50d5 * Action module built-in hook function. 2023-08-17 05:34:33 +00:00
leiyong 131ec38a97 * Revert code: 51295d3f20. 2023-08-17 02:58:30 +00:00
leiyong 51295d3f20 * Update the object associated with the use case through the operation record. 2023-08-17 01:41:19 +00:00
tianshujie 34fddad32b * Code for fix bug #37353. 2023-08-16 16:01:16 +08:00
hufangzhou 331228b978 * Fix bug #37304. 2023-08-16 13:08:19 +08:00
tianshujie fa7c84c69f * Change the issue of the code review. 2023-08-15 16:01:11 +08:00
liumengyi 6a28bbf9ea - Remove unused variables. 2023-08-14 14:34:35 +08:00
tianshujie f4b97329ee * Remove the end date limit and change the start date. 2023-08-14 14:33:19 +08:00
liugang bfa5d18777 * actionModel: get a scene by calling testcaseModel::getSceneByID method instead of query from db. 2023-08-14 09:27:43 +08:00
liumengyi b0d27c83ec * Fix bug of get dynamic count. 2023-08-11 15:01:23 +08:00
daitingting 6e7910bcc3 * Add date condition for efforts.
* Delete not in condition.
2023-08-09 09:27:28 +00:00
daitingting 10b7bd2e51 * Add default endDate. 2023-08-09 06:46:44 +00:00
daitingting 24f7d23731 * Limit beginDate and endDate for project. 2023-08-09 06:02:29 +00:00
tianshujie 0dd10f48dc * Change the get execution paris method. 2023-08-08 16:02:11 +08:00
liumengyi e2ce31d793 * Optimize query efficiency of pre or next actions. 2023-08-08 15:57:47 +08:00
liumengyi 152a5a1c00 * Optimize query efficiency. 2023-08-08 15:34:17 +08:00
tianshujie c51b538f99 + Clean actions for cron. 2023-08-08 14:39:47 +08:00
tianshujie 23f28106ea * Change the query action table when the date < 30. 2023-08-08 14:14:09 +08:00
liumengyi cb03ad3362 * Rename pre or next actions. 2023-08-08 14:13:43 +08:00
liumengyi ecb41011a3 * Change page to limit in actions query. 2023-08-08 13:58:04 +08:00
tianshujie b3c31fb831 * Add ignore object of the action. 2023-08-08 13:27:19 +08:00
zhaoke 69c6c9285d * Refactor space and store module. 2023-08-01 17:20:05 +08:00
zhaoke d5a07b7c96 * Fix error of action and host. 2023-08-01 10:30:52 +08:00
zhaoke 1cb5a15b9d * Refactor mr module. 2023-08-01 09:39:39 +08:00
tanghucheng d667c4d029 Merge branch '18.x' into zentaoipd 2023-07-31 08:58:26 +08:00
Yagami 994d071ed1 * Compatible for php5.x. 2023-07-28 10:56:48 +08:00
Yagami 4e0fee615d * Fix sql error. 2023-07-28 10:19:46 +08:00
tanghucheng 3741c9b6fa Merge branch '18.x' into zentaoipd 2023-07-03 13:36:29 +08:00
caoyanyi 5056cd960a * Fix error for actions. 2023-06-30 12:25:38 +08:00
tanghucheng e52023791a * Fix bug #36036. 2023-06-21 13:35:55 +08:00
tanghucheng 7b95da0b89 * Fix bug #35905. 2023-06-20 13:38:02 +08:00
songchenxuan 52becaebff * Fix bug #35837. 2023-06-15 14:35:04 +08:00
tanghucheng e4f4d5e987 * Replace ',*,' with '*' for projectIdList. 2023-06-14 14:25:53 +08:00
tanghucheng dbdad3b5af * Fix bug #35671. 2023-06-08 06:33:20 +00:00
Yagami d775d8b976 * Fix bug #35057. 2023-05-19 09:21:03 +08:00
tanghucheng 0b70756011 * Fix bug #34998. 2023-05-15 06:16:17 +00:00
Yagami 22f483a854 * Fix bug #34090. 2023-05-14 14:12:53 +08:00
Yagami 5935f603f4 * Change judgment condition. 2023-05-04 18:57:45 +08:00
tanghucheng c30bd36b15 * Finish task #89886. 2023-05-04 14:05:52 +08:00
tanghucheng 45321653ca Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-28 13:10:24 +08:00
wangyidong 61bf3f9d4a * fix bug #34761. 2023-04-25 08:36:29 +08:00
wangyidong 88fa8fc839 * fix bug #34750. 2023-04-24 18:56:38 +08:00
tanghucheng c8a626480d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-21 13:49:46 +08:00
王怡栋 e0d163f5fd Merge branch 'zentaopms_304' into 'master'
Zentaopms 304

See merge request easycorp/zentaopms!7518
2023-04-20 09:31:13 +00:00
hufangzhou b7bbb9cb16 * Adjst the code. 2023-04-20 17:12:19 +08:00
tianshujie 205327d891 * Fixed dynamic error reporting. 2023-04-20 15:28:45 +08:00