External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-29 06:45:09 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11654 from jbradberry/django-3.2-upgrade

Browse Source 
Django 3.2 upgrade
This commit is contained in:
Jeff Bradberry
2022-03-17 10:34:22 -04:00
committed by GitHub
parent 546fc24a0a 574e3ed6ef
commit ac6a82eee4
222 changed files with 1592 additions and 1929 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/__init__.py
View File

@@ -1,4 +1,2 @@
# Copyright (c) 2015 Ansible, Inc.
# All Rights Reserved.
default_app_config = 'awx.ui.apps.UIConfig'

2
awx/ui/apps.py
View File

@@ -1,6 +1,6 @@
# Django
from django.apps import AppConfig
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _
class UIConfig(AppConfig):

2
awx/ui/conf.py
View File

@@ -2,7 +2,7 @@
# All Rights Reserved.
# Django
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _
# AWX
from awx.conf import register, fields

4
awx/ui/fields.py
View File

@@ -7,7 +7,7 @@ import binascii
import re
# Django
from django.utils.translation import ugettext_lazy as _
from django.utils.translation import gettext_lazy as _
# AWX
from awx.conf import fields
@@ -16,7 +16,7 @@ from awx.conf import fields
class PendoTrackingStateField(fields.ChoiceField):
def to_internal_value(self, data):
# Any false/null values get converted to 'off'.
if data in fields.NullBooleanField.FALSE_VALUES or data in fields.NullBooleanField.NULL_VALUES:
if data in fields.BooleanField.FALSE_VALUES or data in fields.BooleanField.NULL_VALUES:
return 'off'
return super(PendoTrackingStateField, self).to_internal_value(data)

6
awx/ui/urls.py
View File

@@ -1,5 +1,5 @@
from django.conf.urls import url
from django.utils.translation import ugettext_lazy as _
from django.urls import re_path
from django.utils.translation import gettext_lazy as _
from django.views.generic.base import TemplateView
from awx.main.utils.licensing import server_product_name
@@ -27,4 +27,4 @@ class MigrationsNotran(TemplateView):
app_name = 'ui'
urlpatterns = [url(r'^$', IndexView.as_view(), name='index'), url(r'^migrations_notran/$', MigrationsNotran.as_view(), name='migrations_notran')]
urlpatterns = [re_path(r'^$', IndexView.as_view(), name='index'), re_path(r'^migrations_notran/$', MigrationsNotran.as_view(), name='migrations_notran')]