feng626
|
ca3d2271a8
|
merge v3
|
2 years ago |
|
ibuler
|
8282a6869a
|
perf: remove system users
|
2 years ago |
|
ibuler
|
2948d5af7f
|
perf: 删除一部分 system user
|
2 years ago |
|
ibuler
|
b8f8c2a264
|
perf: remove application permission
|
2 years ago |
|
feng626
|
0f7b41d177
|
fix: super ticket close bug
|
2 years ago |
|
fit2bot
|
f758414844
|
fix: 审批时 来着不同组织的资产校验 (#8586)
Co-authored-by: feng626 <1304903146@qq.com>
|
2 years ago |
|
fit2bot
|
2abca39597
|
fix: ticket bug (#8584)
Co-authored-by: feng626 <1304903146@qq.com>
|
2 years ago |
|
fit2bot
|
b5cfc6831b
|
feat: 工单支持审批时修改资产 (#8549)
Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
|
2 years ago |
|
fit2bot
|
fd7f73a18e
|
fix: 修复工单权限问题 (#8493)
Co-authored-by: feng626 <1304903146@qq.com>
|
2 years ago |
|
fit2bot
|
8247f24d3f
|
fix: 修复工单bug (#8488)
Co-authored-by: feng626 <1304903146@qq.com>
|
2 years ago |
|
fit2bot
|
7e2f81a418
|
perf: 重构 ticket (#8281)
* perf: 重构 ticket
* perf: 优化 tickets
* perf: 暂存
* perf: 建立 ticket model
* perf: 暂存一下
* perf: 修改 tickets
* perf: 修改 import
* perf: 修改model
* perf: 暂存一波
* perf: 修改...
* del process_map field
* 工单重构
* 资产 应用对接前端
* perf: 修改 ticket
* fix: bug
* 修改迁移文件
* 添加其他api
* 去掉process_map
* perf: 优化去掉 signal
* perf: 修改这里
* 修改一点
* perf: 修改工单
* perf: 修改状态
* perf: 修改工单流转
* step 状态切换
* perf: 修改 ticket open
* perf: 修改流程
* perf: stash it
* 改又改
* stash it
* perf: stash
* stash
* migrate
* perf migrate
* 调整一下
* 修复bug
* 修改一点
* 修改一点
* 优化一波
* perf: ticket migrations
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: feng626 <1304903146@qq.com>
|
2 years ago |
|
Jiangjie.Bai
|
3fde31f2e0
|
fix: 修复工单自定义搜索时500的问题
|
2 years ago |
|
feng626
|
14710e9c9e
|
feat: 工单审批人中去除申请人
|
3 years ago |
|
fit2bot
|
1f8ded49fa
|
feat: 工作台区分组织 (#8040)
* perf: 工作台受组织角色控制
* perf: workspace => workbench
* perf: 修改 workspace codename
Co-authored-by: ibuler <ibuler@qq.com>
|
3 years ago |
|
fit2bot
|
5cc2fdae4f
|
fix: 修复api docs打不开的问题 (#7938)
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
|
3 years ago |
|
feng626
|
3a26b9d102
|
fix: 修复工单相应bug
|
3 years ago |
|
Jiangjie.Bai
|
572c5b6925
|
fix: 修改工单管理权限位
|
3 years ago |
|
fit2bot
|
a18b9bad0a
|
fix: 修复ticketsession (#7857)
Co-authored-by: feng626 <1304903146@qq.com>
|
3 years ago |
|
fit2bot
|
d77e84e6f8
|
fix: ticket comment bug (#7854)
Co-authored-by: feng626 <1304903146@qq.com>
|
3 years ago |
|
fit2bot
|
f0325c48df
|
fix: 工单权限 (#7808)
Co-authored-by: feng626 <1304903146@qq.com>
|
3 years ago |
|
fit2bot
|
dafc416783
|
Fix rbac (#7728)
* perf: 重命名 signal handlers
* fix: 修复 ticket processor 问题
* perf: 修改 ticket 处理人api
* fix: 修复创建系统账号bug
* fix: 升级celery_beat==2.2.1和flower==1.0.0;修改celery进程启动参数先后顺序
* perf: 修改 authentication token
* fix: 修复上传权限bug
* fix: 登录页面增加i18n切换;
* fix: 系统角色删除限制
* perf: 修改一下 permissions tree
* perf: 生成 i18n
* perf: 修改一点点
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
|
3 years ago |
|
fit2bot
|
ab1024fbf4
|
perf: 优化 super ticket 的状态 (#7714)
* fix: token 系统用户增加 protocol
* fix: 修复清除orphan session时同时清除对应的 session_task
* perf: 修改 connection token api
* fix: 修复无法获取系统角色绑定的问题
* perf: 增加 db terminal 及 magnus 组件
* perf: 修改 migrations
* fix: 修复AUTHENTICATION_BACKENDS相关的逻辑
* fix: 修改判断backend认证逻辑
* fix: 修复资产账号查看密码跳过mfa
* fix: 修复用户组授权权限错误
* feat: 支持COS对象存储
* feat: 升级依赖 jms_storage==0.0.42
* fix: 修复 koko api 问题
* feat: 修改存储翻译信息
* perf: 修改 ticket 权限
* fix: 修复获取资产授权系统用户 get_queryset
* perf: 抽取 ticket
* perf: 修改 cmd filter 的权限
* fix: 修改 ticket perm
* perf: 修改工单的api
Co-authored-by: Eric <xplzv@126.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>
Co-authored-by: ibuler <ibuler@qq.com>
Co-authored-by: 小冯 <xiaofeng@xiaofengdeMacBook-Pro.local>
Co-authored-by: feng626 <1304903146@qq.com>
|
3 years ago |
|
xinwen
|
f460916e84
|
fix: swagger
|
3 years ago |
|
fit2bot
|
e259d2a9e9
|
fix: fix rbac to dev (#7636)
* feat: 添加 RBAC 应用模块
* feat: 添加 RBAC Model、API
* feat: 添加 RBAC Model、API 2
* feat: 添加 RBAC Model、API 3
* feat: 添加 RBAC Model、API 4
* feat: RBAC
* feat: RBAC
* feat: RBAC
* feat: RBAC
* feat: RBAC
* feat: RBAC 整理权限位
* feat: RBAC 整理权限位2
* feat: RBAC 整理权限位2
* feat: RBAC 整理权限位
* feat: RBAC 添加默认角色
* feat: RBAC 添加迁移文件；迁移用户角色->用户角色绑定
* feat: RBAC 添加迁移文件；迁移用户角色->用户角色绑定
* feat: RBAC 修改用户模块API
* feat: RBAC 添加组织模块迁移文件 & 修改组织模块API
* feat: RBAC 添加组织模块迁移文件 & 修改组织模块API
* feat: RBAC 修改用户角色属性的使用
* feat: RBAC No.1
* xxx
* perf: 暂存
* perf: ...
* perf(rbac): 添加 perms 到 profile serializer 中
* stash
* perf: 使用init
* perf: 修改migrations
* perf: rbac
* stash
* stash
* pref: 修改rbac
* stash it
* stash: 先去修复其他bug
* perf: 修改 role 添加 users
* pref: 修改 RBAC Model
* feat: 添加权限的 tree api
* stash: 暂存一下
* stash: 暂存一下
* perf: 修改 model verbose name
* feat: 添加model各种 verbose name
* perf: 生成 migrations
* perf: 优化权限位
* perf: 添加迁移脚本
* feat: 添加组织角色迁移
* perf: 添加迁移脚本
* stash
* perf: 添加migrateion
* perf: 暂存一下
* perf: 修改rbac
* perf: stash it
* fix: 迁移冲突
* fix: 迁移冲突
* perf: 暂存一下
* perf: 修改 rbac 逻辑
* stash: 暂存一下
* perf: 修改内置角色
* perf: 解决 root 组织的问题
* perf: stash it
* perf: 优化 rbac
* perf: 优化 rolebinding 处理
* perf: 完成用户离开组织的问题
* perf: 暂存一下
* perf: 修改翻译
* perf: 去掉了 IsSuperUser
* perf: IsAppUser 去掉完成
* perf: 修改 connection token 的权限
* perf: 去掉导入的问题
* perf: perms define 格式，修改 app 用户 的全新啊
* perf: 修改 permission
* perf: 去掉一些 org admin
* perf: 去掉部分 org admin
* perf: 再去掉点 org admin role
* perf: 再去掉部分 org admin
* perf: user 角色搜索
* perf: 去掉很多 js
* perf: 添加权限位
* perf: 修改权限
* perf: 去掉一个 todo
* merge: with dev
* fix: 修复冲突
Co-authored-by: Bai <bugatti_it@163.com>
Co-authored-by: Michael Bai <baijiangjie@gmail.com>
Co-authored-by: ibuler <ibuler@qq.com>
|
3 years ago |
|
feng626
|
ff9347e344
|
fix: 工单流需要超级管理员配置
|
3 years ago |
|
feng626
|
7f36958683
|
perf: 工单流只需组织管理员权限
|
3 years ago |
|
xinwen
|
43c4c78378
|
fix: 工单序号添加排序
|
3 years ago |
|
xinwen
|
bd84edea62
|
feat: 资产登录工单页面增加监控与中断
|
3 years ago |
|
feng626
|
38c870a0b5
|
perf: 工单流对应受理人懒加载
|
3 years ago |
|
Michael Bai
|
28a6024b49
|
fix: 修改工单列表默认按照创建日志倒叙排序，修改翻译
|
3 years ago |
|
Michael Bai
|
3fffd667dc
|
fix: 修改系统用户、工单列表排序字段
|
3 years ago |
|
Michael Bai
|
06de6c3575
|
fix: 修复资产系统用户auth-info获取流程及创建时手动登录方式的校验
|
3 years ago |
|
feng626
|
5854ad1975
|
perf: 优化变量名
|
3 years ago |
|
fit2bot
|
0f87f05b3f
|
feat: 工单多级审批 + 模版创建 (#6640)
* feat: 工单多级审批 + 模版创建
* feat: 工单权限处理
* fix: 工单关闭后 再审批bug
* perf: 修改一点
Co-authored-by: feng626 <1304903146@qq.com>
Co-authored-by: ibuler <ibuler@qq.com>
|
3 years ago |
|
feng626
|
c6bb9e97fb
|
fix: 工单已关闭 再审批bug
|
3 years ago |
|
Bai
|
50918a3dd2
|
feat: 添加命令复核逻辑; 添加命令复核工单;
|
4 years ago |
|
Jiangjie.Bai
|
64641a18e6
|
feat: ACL (#5696)
* feature: acl (v0.1)
* feature: acl (v0.2)
* feature: acl (v0.3)
* feature: acl (v0.4)
* feature: acl (v0.5)
* feature: acl (v0.6)
* feature: acl (v0.7)
* feature: acl (v0.8)
* feature: acl (v0.9)
* feature: acl (v1.0)
* feature: acl (v1.1)
* feature: acl (v1.2)
* feature: acl (v1.3)
* feature: acl (v1.4)
* feature: acl (v1.5)
* feature: acl (v1.6)
* feature: acl (v1.7)
* feature: acl (v1.8)
* feature: acl (v1.9)
* feature: acl (v2.0)
* feature: acl (v2.1)
* feature: acl (v2.2)
* feature: acl (v2.3)
* feature: acl (v2.4)
* feature: acl (v2.5)
* feature: acl (v2.6)
* feature: acl (v2.7)
* feature: acl (v2.8)
* feature: acl (v2.9)
* feature: acl (v3.0)
* feature: acl (v3.1)
* feature: acl (v3.2)
* feature: acl (v3.3)
* feature: acl (v3.4)
* feature: acl (v3.5)
* feature: acl (v3.6)
* feature: acl (v3.7)
* feature: acl (v3.8)
* feature: acl (v3.9)
* feature: acl (v4.0)
* feature: acl (v4.1)
* feature: acl (v4.2)
* feature: acl (v4.3)
* feature: acl (v4.4)
|
4 years ago |
|
Bai
|
1d15f7125e
|
perf: 优化org获取逻辑 - 采用redis订阅机制实现orgs_mapping数据的维护;删除get_org_by_id等方法;
perf: 优化get_instance接口
|
4 years ago |
|
Bai
|
44a42e4739
|
fix: 修改用户相关tickets为自己申请的或者待受理的
|
4 years ago |
|
Bai
|
a0cb16e5c4
|
perf: 修改关闭工单API权限, 申请人有权限关闭工单
|
4 years ago |
|
fit2bot
|
a7468a243d
|
perf: 重构工单处理流程 (#5408)
* perf: 重构工单处理流程
* perf: 重构工单处理流程 (1)
* perf: 重构工单处理流程 (2)
* perf: 重构工单处理流程 (3)
* perf: 重构工单处理流程 (4)
* perf: 重构工单处理流程 (5)
* perf: 重构工单处理流程 (6)
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
|
fit2bot
|
86a055638c
|
reactor: 重构命令&录像存储模块的Serializer及相关模块 (#5392)
* reactor: 重构命令&录像存储模块的Serializer及相关模块
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
|
ibuler
|
e7a3c5a822
|
perf(api): filter_fields被filterset_fields取代
https://django-filter.readthedocs.io/en/stable/guide/migration.html
|
4 years ago |
|
fit2bot
|
17a01a12db
|
reactor: 增加DynamicMappingSerializer类，实现Serializer中的字段可以动态改变的功能 (#5379)
* reactor: 增加DynamicMappingSerializer类，实现Serializer中的字段可以动态改变的功能
* reactor: 增加DynamicMappingSerializer类，实现Serializer中的字段可以动态改变的功能 (2)
* reactor: 增加DynamicMappingSerializer类，实现Serializer中的字段可以动态改变的功能 (3)
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
|
fit2bot
|
7e7e24f51f
|
reactor&remove: 重构applications模块 & 移除applications、perms中已不再使用的模块 (#5374)
* reactor: 重构applications模块 & 删除applications、perms中已不再使用的模块
* reactor: 1. 针对application.attrs字段的view-serializer映射逻辑，采用DynamicMapping的方案重写;
* reactor: 2. 删除applications和perms模块中已不再使用的database-app/k8s-app/remote-app模块;
* reactor: 添加迁移文件(删除perms/databaseperrmission/remoteapppermission/k8sapppermission)
* reactor: 修改细节
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
|
Bai
|
24b1c87121
|
perf: 修改细节
|
4 years ago |
|
fit2bot
|
cef93abb2f
|
feat: 抽象View Mapping Serializer架构设计; 重构工单View、Serializer模块 (#5371)
* perf: 优化工单模块(修改迁移文件->Model assignees_display 字段类型为list)
* ignore: try `view` `serializer jsonfields` Map design (1)
* ignore: try `view` `serializer jsonfields` Map design (2)
* ignore: try `view` `serializer jsonfields` Map design (3)
* ignore: try `view` `serializer jsonfields` Map design (4)
* ignore: try `view` `serializer jsonfields` Map design (5)
* ignore: try `view` `serializer.DynamicMappingField` Mapping design (6)
* feat: 抽象view_mapping_serializer逻辑架构; 重构工单View、Serializer模块
* feat: 抽象view_mapping_serializer逻辑架构; 重构工单View、Serializer模块(2)
* feat: 抽象view_mapping_serializer逻辑架构; 重构工单View、Serializer模块(3)
* feat: 抽象view_mapping_serializer逻辑架构; 重构工单View、Serializer模块(4)
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
|
Bai
|
5c483084b7
|
feat: 优化工单模块
|
4 years ago |
|
Bai
|
1a9a5c28f5
|
feat: 优化工单模块1
|
4 years ago |
|
fit2bot
|
430e20a49c
|
feat: 优化工单模块 (#5361)
* feat: 优化工单模块1
* feat: 优化工单模块2
* feat: 优化工单模块3
Co-authored-by: Bai <bugatti_it@163.com>
|
4 years ago |
