Commit Graph
705 Commits
Author SHA1 Message Date
wangxuepeng e0d3e61339 * Replace all 'and' or 'or' with '&&' or '||'. 2023-09-21 01:03:38 +00:00
wangxuepeng afcd95268d * Fixed method getHisotry for action module, support array and int. 2023-09-20 11:35:18 +00:00
wangxuepeng 88dce1586f * Add unit test for action buildGroupDate. 2023-09-20 11:25:00 +00:00
wangxuepeng b3660b244a * Add unit test for action restoreStages. 2023-09-20 10:40:51 +00:00
wangxuepeng 1797a7a229 * Fixed getHistory method's note of action model. 2023-09-20 08:32:56 +00:00
tianshujie 392c622d9c * Add return value for saveIndex method. 2023-09-20 16:11:03 +08:00
wangxuepeng aab4974d29 * Add note to the model layer of the action module. 2023-09-20 07:43:57 +00:00
wangxuepeng bcc8fab1a2 * Fixed unit test of getdynamicbysearch method of the action module. 2023-09-20 05:41:45 +00:00
wangxuepeng 53382c8118 * Unit test of the getdynamicbysearch method of action module. 2023-09-20 05:08:30 +00:00
wangxuepeng 8a37465128 * Unit test of the transformActions method of action module. 2023-09-19 09:31:24 +00:00
wangxuepeng 25c8bf8fc1 * Unit test of the getdynamic method of action module. 2023-09-19 06:47:35 +00:00
wangxuepeng 779cd9bce9 * Unit test of the getObjectLabel method of action module. 2023-09-18 09:17:31 +00:00
wangxuepeng 0274b33e5f * Unit test of the getbysql method of action module. 2023-09-18 08:21:10 +00:00
wangxuepeng 2bdb3ab3f9 * Unit test of the getlist method of action module. 2023-09-18 07:56:53 +00:00
liugang cbea619aa2 * actionModel: fix error doesn't have default return value. 2023-09-18 10:47:15 +08:00
caoyanyi f831aaccea * Change params type. 2023-09-18 09:53:28 +08:00
wangxuepeng 6fa0024c18 * Unit test of the updateComment method of action module. 2023-09-16 06:11:17 +00:00
wangxuepeng 854504f10d * Unit test of the read method of action module. 2023-09-14 07:50:50 +00:00
wangxuepeng d333e7fceb * Unit test of the hideone and hideall method of action module. 2023-09-12 09:04:32 +00:00
wangxuepeng bf13fbe98e * Refactor restoreStages method of the action module. 2023-09-11 08:45:24 +00:00
tianshujie 1f1f886d83 * Change the params type for the $comment. 2023-09-11 13:50:12 +08:00
dingguodong bfad848bee * Rename ACTIONMODEL to actionModel. 2023-09-07 09:35:38 +08:00
dingguodong 3598c0cc00 * Allow extra field can be integer then to string before use. 2023-09-07 09:35:38 +08:00
wangxuepeng 08929417bd * Refactor method editComment of the action module. 2023-09-06 09:03:41 +00:00
wangxuepeng 5a6ce289a4 * Refactor method hideAll of the action module. 2023-09-05 08:28:57 +00:00
wangxuepeng 26be65927e * Refactor method hideOne of the action module. 2023-09-05 07:37:02 +00:00
wangxuepeng f7d50b3630 * Refactor method undelte of the action module. 2023-09-05 07:29:28 +00:00
wangxuepeng a22bc8802b * Recover the create method of the module layer of the action module. 2023-08-31 07:54:51 +00:00
wangxuepeng 1b8605fbed * Refactor action control undelete. 2023-08-31 01:47:43 +00:00
dingguodong b1c5342cd4 * Refactor this function. 2023-08-30 14:51:36 +08:00
wangxuepeng 7bb8f8e624 * Editor uploadUrl default value. 2023-08-30 02:05:59 +00:00
wangxuepeng 6a892e2c11 * Refactor action control create method. 2023-08-29 08:07:59 +00:00
wangxuepeng 482fafb2cb * Refactor action trash method. 2023-08-29 05:50:54 +00:00
wangyuting 0b4a034adb * Finish mergeprogram. 2023-08-16 10:26:13 +08:00
zhaoke 5c4cb46b14 * Refactor upgrade view of instance,adjust lang file of instance. 2023-07-26 19:44:51 +08:00
zhaoke 1e63391ebc * Finish task #98672,#98671. 2023-07-26 15:01:32 +08:00
zhaoke 2b92cf5881 * Finish task #98673,#98677. 2023-07-25 20:10:44 +08:00
liumengyi 2b680458c8 * Refactor ui of my::dynamic. 2023-07-19 13:51:46 +08:00
朱金勇 ccb6a094f9 * Change constant to variable. 2023-07-10 04:31:47 +00:00
wangyuting 46b92f7b1d * Adjust idvalue to objectID. 2023-06-12 15:48:53 +08:00
hufangzhou dc8fcc9484 * Merge 18.4 into master. 2023-05-05 09:26:04 +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
wangyidong b52f1da1bf * fix for php8.1 2023-04-24 09:05:04 +08:00
Hao Sun 2bcc9bdbf4 Merge branch 'zin_dev'
# Conflicts:
#	module/common/lang/zh-cn.php
#	module/product/lang/de.php
#	module/product/lang/en.php
#	module/product/lang/fr.php
#	module/product/lang/zh-cn.php
#	module/program/js/browse.js
#	module/program/lang/de.php
#	module/program/lang/en.php
#	module/program/lang/fr.php
#	module/program/lang/zh-cn.php
#	module/project/config.php
#	module/project/lang/de.php
#	module/project/lang/en.php
#	module/project/lang/fr.php
#	module/project/lang/zh-cn.php
#	module/search/view/buildform.html.php
#	module/task/control.php
2023-04-23 19:20:45 +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
hufangzhou e18b37128f Merge branch 'master' into zentaopms_304 2023-04-20 13:03:30 +08:00
朱金勇 532ff84269 * Fix bug#34446. 2023-04-20 03:50:25 +00:00