Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gjl2004yn
jumpserver
提交
1c264399
J
jumpserver
项目概览
gjl2004yn
/
jumpserver
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jumpserver
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
1c264399
编写于
7月 02, 2020
作者:
B
Bai
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feat(domain + migrate): 修改网域唯一字段为:org_id + name
上级
872e2546
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
24 addition
and
1 deletion
+24
-1
apps/assets/migrations/0050_auto_20200702_1602.py
apps/assets/migrations/0050_auto_20200702_1602.py
+22
-0
apps/assets/models/domain.py
apps/assets/models/domain.py
+2
-1
未找到文件。
apps/assets/migrations/0050_auto_20200702_1602.py
0 → 100644
浏览文件 @
1c264399
# Generated by Django 2.2.10 on 2020-07-02 08:02
from
django.db
import
migrations
,
models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'assets'
,
'0049_systemuser_sftp_root'
),
]
operations
=
[
migrations
.
AlterField
(
model_name
=
'domain'
,
name
=
'name'
,
field
=
models
.
CharField
(
max_length
=
128
,
verbose_name
=
'Name'
),
),
migrations
.
AlterUniqueTogether
(
name
=
'domain'
,
unique_together
=
{(
'org_id'
,
'name'
)},
),
]
apps/assets/models/domain.py
浏览文件 @
1c264399
...
@@ -17,13 +17,14 @@ __all__ = ['Domain', 'Gateway']
...
@@ -17,13 +17,14 @@ __all__ = ['Domain', 'Gateway']
class
Domain
(
OrgModelMixin
):
class
Domain
(
OrgModelMixin
):
id
=
models
.
UUIDField
(
default
=
uuid
.
uuid4
,
primary_key
=
True
)
id
=
models
.
UUIDField
(
default
=
uuid
.
uuid4
,
primary_key
=
True
)
name
=
models
.
CharField
(
max_length
=
128
,
unique
=
True
,
verbose_name
=
_
(
'Name'
))
name
=
models
.
CharField
(
max_length
=
128
,
verbose_name
=
_
(
'Name'
))
comment
=
models
.
TextField
(
blank
=
True
,
verbose_name
=
_
(
'Comment'
))
comment
=
models
.
TextField
(
blank
=
True
,
verbose_name
=
_
(
'Comment'
))
date_created
=
models
.
DateTimeField
(
auto_now_add
=
True
,
null
=
True
,
date_created
=
models
.
DateTimeField
(
auto_now_add
=
True
,
null
=
True
,
verbose_name
=
_
(
'Date created'
))
verbose_name
=
_
(
'Date created'
))
class
Meta
:
class
Meta
:
verbose_name
=
_
(
"Domain"
)
verbose_name
=
_
(
"Domain"
)
unique_together
=
[(
'org_id'
,
'name'
)]
def
__str__
(
self
):
def
__str__
(
self
):
return
self
.
name
return
self
.
name
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录