Commit Graph

117 Commits

Author SHA1 Message Date
pycook 4ab7e3c70c fix merge conflict 2023-08-21 11:55:49 +08:00
pycook a7fe75f7df fix g.user 2023-08-21 11:54:33 +08:00
EvanSung 52c32e2ab1 fix(acl): g user issue 2023-08-17 18:40:45 +08:00
pycook d3224625b6 fix MyJSONEncoder 2023-08-16 21:28:27 +08:00
pycook 6dc12bb6ac Merge branch 'master' of github.com:veops/cmdb 2023-08-16 13:00:44 +08:00
pycook b33ae16c00 Delete user without soft delete 2023-08-16 13:00:30 +08:00
pycook 3a0369559f
Merge pull request #154 from simontigers/common_setting_format
fix: init-import-user-from-acl
2023-08-15 20:47:36 +08:00
hu.sima a74a2c5a94 fix: init-import-user-from-acl 2023-08-15 20:45:28 +08:00
pycook 9fbcb2838e
Merge pull request #153 from simontigers/common_setting_format
fix: import_user_from_acl
2023-08-15 20:25:09 +08:00
hu.sima 60a445b972 fix: import_user_from_acl 2023-08-15 20:19:45 +08:00
pycook ab093d2493 [update] delete roles, users, attributes 2023-08-15 19:47:59 +08:00
hu.sima 2125f020b5 fix: default arg value 2023-08-10 19:05:56 +08:00
hu.sima f11aadf6d4 fix: remove useless 2023-08-10 18:55:32 +08:00
hu.sima 95e8f9de74 fix: remove unused column 2023-08-10 16:29:52 +08:00
hu.sima 26792147ae style: format common setting 2023-08-10 15:30:01 +08:00
EvanSung e2b1cb3003 optimize(auth): auth request json 2023-08-10 10:43:59 +08:00
pycook f75a85b48a fix celery config 2023-08-08 16:33:24 +08:00
pycook e0666689e5 upgrade celery 2023-08-08 13:16:07 +08:00
pycook 9bbbcbe6dc upgrade flask to 2.3.2 and replace g.user with current_user 2023-08-06 21:54:18 +08:00
pycook 16d6b40e8d
Merge pull request #138 from lovvvve/fix_ldap
fix ldap login
2023-08-04 11:31:58 +08:00
songbing01249 8de54812dc fix(trigger): session invalid issue 2023-08-02 18:22:42 +08:00
lovvvve eb7d52cf35 fix ldap login 2023-08-01 11:27:29 +00:00
hu.sima 6c3e3f9eed fix: remove pandas 2023-08-01 15:32:44 +08:00
pycook ac6e3a0318 fix dependabot alerts 2023-08-01 13:47:11 +08:00
pycook 536daa6d4f fix delete ci_type 2023-07-31 18:39:33 +08:00
pycook 0655b0e9eb add command cmdb-index-table-upgrade 2023-07-25 10:31:30 +08:00
pycook 52574c64cc 废弃3个表: c_value_datetime c_value_floats c_value_integers, time类型属性值增加写入校验 2023-07-24 21:55:00 +08:00
pycook fb904b01a6 禁止删除唯一标识的属性 2023-07-21 15:58:41 +08:00
songbing01249 ec97fa84d8 fix(ci_type_group_manager): fix resources issues 2023-07-20 11:01:25 +08:00
lovvvve 4d16e9e6d9 Update click_cmdb.py
add-user remove --is_admin
2023-07-13 15:49:35 +08:00
lovvvve f98fd24c62 Update click_cmdb.py
add-user  remove --is_admin
2023-07-13 15:18:47 +08:00
pycook a386de355e docker-compose is ok 2023-07-11 18:22:17 +08:00
pycook b93afc1790 docker-compose is ok 2023-07-11 18:12:22 +08:00
pycook 77d89677ef 前后端全面升级 2023-07-10 20:13:39 +08:00
pycook 98cc853dbc 前后端全面升级 2023-07-10 20:07:20 +08:00
lovvvve 51e4b5dd8f fix: 🐛 db search
Escape ":" character in SQLAlchemy
2021-11-10 18:56:42 +08:00
x-7 8e578797ef Update ci.py
cmdb-api:add attr check in ci_manager update method
2021-04-21 19:17:05 +08:00
lovvvve 3cf234d49e Update value.py
value type 是 int 或 float 时 value 值等于 0 是会删除 的 BUG
2021-01-28 16:57:20 +08:00
lovvvve a7debc1b3b Update ci.py
兼容 py2
2021-01-28 16:56:04 +08:00
lovvvve 9268da2ffa Update value.py 2021-01-28 16:46:19 +08:00
lovvvve cfcb092478 Update value.py
feat(AttributeValueManager.create_or_update_attr_value()): AttributeValue update skip The same value
2021-01-28 16:32:53 +08:00
lovvvve 0d8b41b64a Update value.py
feat(AttributeValueManager.create_or_update_attr_value()): AttributeValue update skip The same value
2021-01-28 16:30:17 +08:00
lovvvve d85715793f Update ci.py
feat(CiManager.add()): Check the attribute is in the ci_type attributes list
2021-01-28 16:27:56 +08:00
pycook b2578b61fa add command: add-user | del-user 2020-06-11 21:37:41 +08:00
pycook f5671c2a2a Fix: spelling mistakes 2020-05-28 20:28:49 +08:00
pycook 8348f8e7b1 Fix the judgment of app admin 2020-04-07 18:02:26 +08:00
pycook 036e1d236b auth with ldap 2020-04-01 20:30:44 +08:00
pycook c31be0f753 UI: batch update relation 2020-04-01 11:09:41 +08:00
pycook 2a0ed72235 fix: delete attribute 2020-03-23 15:49:33 +08:00
pycook 2cce2d5cf2 Fix: permission management 2020-03-13 10:30:21 +08:00
pycook 194a2254a6 fix case sensitive of ES search 2020-02-28 14:32:51 +08:00
pycook 1521a71f9c alter table c_preference_relation_views column name varchar(64) 2020-02-23 23:13:22 +08:00
pycook 9eaca4d6a0 add library future 2020-02-21 23:29:20 +08:00
penzai 5a3e55813c model: allow origin and ticket_id nullable in OperationRecord 2020-02-16 18:03:08 +08:00
penzai bc72e58886 auth: add user in flask.g when auth by jwt 2020-02-16 18:02:24 +08:00
penzai f4879d20d6 fix: recycle import by celery task 2020-02-16 09:39:33 +08:00
pycook db52b28d6b fix jwt decode 2020-02-06 09:59:24 +08:00
Bonsai 6c5ee3fcd9 Merge pull request #2 from pycook/master
merge from main repo
2020-02-04 10:56:03 +08:00
penzai bce422ffc8 fix: update attribute group without name params will fail. #tests/test_cmdb_ci_type.py::test_update_attribute_group_ci_type 2020-02-04 10:53:07 +08:00
pycook 23319c7417 /ci_types/<int:type_id>/attributes/transfer and /ci_types/<int:type_id>/attribute_groups/transfer 2020-01-19 17:59:32 +08:00
pycook 3130d94568 [fix] cycle import 2020-01-15 11:52:33 +08:00
pycook 04a66eb239 flush cache when delete attribute 2020-01-15 09:06:31 +08:00
pycook 68390ec6f1 [fix] delete CIType's attribute 2020-01-14 20:52:36 +08:00
pycook f2fdb29221 api docs update 2020-01-06 21:54:33 +08:00
pycook 89ae89a449 [fix] validate attribute is required 2019-12-24 20:37:32 +08:00
pycook 2ba6a16613 support JSON type 2019-12-23 18:51:33 +08:00
pycook f66a94712e Modify code organization 2019-12-18 23:33:22 +09:00