mirror of
https://github.com/jumpserver/jumpserver.git
synced 2025-12-16 00:52:41 +00:00
Compare commits
2 Commits
v5
...
revert-162
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
40369b5df3 | ||
|
|
f42a08152d |
@@ -1,4 +1,4 @@
|
|||||||
FROM jumpserver/core-base:20251014_095903 AS stage-build
|
FROM jumpserver/core-base:20251029_031929 AS stage-build
|
||||||
|
|
||||||
ARG VERSION
|
ARG VERSION
|
||||||
|
|
||||||
|
|||||||
@@ -603,7 +603,7 @@ class JSONManyToManyField(models.JSONField):
|
|||||||
return None
|
return None
|
||||||
if isinstance(value, RelatedManager):
|
if isinstance(value, RelatedManager):
|
||||||
value = value.value
|
value = value.value
|
||||||
return value
|
return json.dumps(value)
|
||||||
|
|
||||||
def validate(self, value, model_instance):
|
def validate(self, value, model_instance):
|
||||||
super().validate(value, model_instance)
|
super().validate(value, model_instance)
|
||||||
|
|||||||
@@ -68,14 +68,14 @@ dependencies = [
|
|||||||
'ipip-ipdb==1.6.1',
|
'ipip-ipdb==1.6.1',
|
||||||
'pywinrm==0.4.3',
|
'pywinrm==0.4.3',
|
||||||
'python-nmap==0.7.1',
|
'python-nmap==0.7.1',
|
||||||
'django==4.2.24',
|
'django==4.1.13',
|
||||||
'django-bootstrap3==23.4',
|
'django-bootstrap3==23.4',
|
||||||
'django-filter==23.2',
|
'django-filter==23.2',
|
||||||
'django-formtools==2.5.1',
|
'django-formtools==2.5.1',
|
||||||
'django-ranged-response==0.2.0',
|
'django-ranged-response==0.2.0',
|
||||||
'django-simple-captcha==0.5.18',
|
'django-simple-captcha==0.5.18',
|
||||||
'django-timezone-field==5.1',
|
'django-timezone-field==5.1',
|
||||||
'djangorestframework==3.16.1',
|
'djangorestframework==3.14.0',
|
||||||
'djangorestframework-bulk==0.2.1',
|
'djangorestframework-bulk==0.2.1',
|
||||||
'django-simple-history==3.6.0',
|
'django-simple-history==3.6.0',
|
||||||
'django-private-storage==3.1',
|
'django-private-storage==3.1',
|
||||||
|
|||||||
Reference in New Issue
Block a user