Commit Graph
36869 Commits
Author SHA1 Message Date
孙广明 2a17a2c345 Merge branch 'zenops_liyuchun_executionnode' into 'zenops_46'
* Finish task #68711.

See merge request easycorp/zentaopms!5399
2022-09-19 09:24:43 +00:00
wangjianhua a0b40264c6 * Modify defalult value of variable. 2022-09-19 15:06:30 +08:00
liyuchun 4057bf55a2 * Add auth. 2022-09-19 14:51:37 +08:00
wangjianhua e61cf8eea0 * Remove space letter. 2022-09-19 14:45:18 +08:00
liyuchun 327952a5c6 * Delete unused file. 2022-09-19 14:42:57 +08:00
liyuchun b348850046 * Finish task #68711. 2022-09-19 14:38:07 +08:00
wangjianhua 330a995630 * Modify lang items and add privileges. 2022-09-19 14:00:01 +08:00
wangjianhua f9f4e51862 * Finish task #68708: edit VM template. 2022-09-19 11:22:22 +08:00
wangjianhua 0657bf31ba * Edit VM template. 2022-09-18 23:50:58 +08:00
wangjianhua 641dc1a8b3 * Fix host ID. 2022-09-16 23:38:57 +08:00
liyuchun ca672078b7 * Fix error when create vm template. 2022-09-16 15:58:54 +08:00
liyuchun 62c6b45d70 * Add function to select template. 2022-09-16 15:47:10 +08:00
wangjianhua 55cd24ece5 * Load image list by ajax. 2022-09-16 15:12:58 +08:00
wangjianhua 5d258bf7e4 Merge branch 'zenops_46' into zenops_46_wangjianhua_68266 2022-09-15 20:24:19 +08:00
wangjianhua c080b051c6 * Rebuild crate VM template page. 2022-09-15 18:07:37 +08:00
liyuchun f08444eeb3 * Fix error for task #68256. 2022-09-15 17:15:36 +08:00
liyuchun 3458ef98fd * Add memory size unit. 2022-09-15 16:33:32 +08:00
wangjianhua 6bd9d8193a * Add required mark in create vm template form. 2022-09-15 15:48:29 +08:00
李玉春 0a6f8e3f09 Merge branch 'zenops_46_wangjianhua_68266' into 'zenops_46'
Finish task #68266: create vm template. And Improve codes format.

See merge request easycorp/zentaopms!5345
2022-09-15 06:42:09 +00:00
李玉春 3252a34b85 Update model.php 2022-09-15 06:42:00 +00:00
liyuchun 1bb1e5fcd4 * Fix error for task #68706. 2022-09-15 14:39:56 +08:00
wangjianhua 259865d262 * Format codes. 2022-09-15 14:28:18 +08:00
liyuchun 18496b20b5 * Code for task #68710. 2022-09-15 14:12:21 +08:00
wangjianhua e7983acad4 * Finish create vm template. 2022-09-15 13:46:04 +08:00
wangjianhua bf20f6f8ff + Add lang items. 2022-09-15 12:28:53 +08:00
liyuchun 75828bba56 Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46 2022-09-15 11:30:01 +08:00
liyuchun a911a6e183 * Finish task #68707. 2022-09-15 11:29:24 +08:00
李玉春 9e319839c6 Merge branch 'zenops_46_wangjianhua_68262' into 'zenops_46'
Check IP and generate secret when in create host form.

See merge request easycorp/zentaopms!5331
2022-09-15 03:28:47 +00:00
wangjianhua 7ba4784d1c * Check IP and generate secret. 2022-09-15 11:07:57 +08:00
liyuchun c3e0654651 * Finish task #68706. 2022-09-14 23:24:13 +08:00
wangjianhua 52dd5894a0 * Register host on ZAgent server. 2022-09-14 23:06:12 +08:00
wangjianhua 6cefa23025 * Clear last error before show new. 2022-09-14 22:59:42 +08:00
wangjianhua f1b1d59f16 * Format codes. 2022-09-14 22:16:06 +08:00
wangjianhua cf218d471d Merge branch 'zenops_46' into zenops_46_wangjianhua_68264 2022-09-14 22:08:11 +08:00
wangjianhua 82ff4d76eb * Finish task #68264: check access of zagent server. 2022-09-14 21:20:44 +08:00
liyuchun 846b8604d4 * Add language. 2022-09-14 17:32:13 +08:00
liyuchun c347b99c04 * Finish task #68256. 2022-09-14 17:24:42 +08:00
liyuchun bcbca8e2db * Finish task #68265. 2022-09-14 17:23:38 +08:00
liyuchun 9066342e3b * Code for task #68265. 2022-09-14 08:49:42 +08:00
wangjianhua 6d3d643d09 * Improve codes format. 2022-09-13 13:42:10 +08:00
wangjianhua 03fa6a1321 * Create virtual host template. 2022-09-11 09:03:10 +08:00
wangjianhua 557bf8e9a6 * Fix bugs of creating zahost. 2022-09-10 11:44:46 +08:00
liyuchun d7522b8c6a * Adjsut zahost browse. 2022-09-09 16:50:27 +08:00
liyuchun 1477a67043 * Add create host button. 2022-09-09 16:26:14 +08:00
liyuchun 3180cbf395 * Finish task #68263. 2022-09-09 16:12:49 +08:00
李玉春 0a7ac9eb69 Merge branch 'zenops_46' into 'zenops_46_wangjianhua_68262'
# Conflicts:
#   db/update17.6.1.sql
#   module/common/lang/menu.php
2022-09-09 05:04:21 +00:00
wangjianhua 3fb006faf4 * Fix comment. 2022-09-09 12:08:05 +08:00
wangjianhua 797f97b5f7 * Remove spaces. 2022-09-09 11:22:34 +08:00
wangjianhua 91f2b18964 * Improve error message. 2022-09-09 10:46:06 +08:00
liyuchun c77b970a80 * Code for task #68263. 2022-09-09 08:35:42 +08:00