Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

✨ Replace django-better-admin-arrayfield with django-jsonform #75

Merged
merged 1 commit into from
Jan 5, 2024
Merged

✨ Replace django-better-admin-arrayfield with django-jsonform #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions mozilla_django_oidc_db/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
from django.contrib import admin
from django.utils.translation import gettext_lazy as _

from django_better_admin_arrayfield.admin.mixins import DynamicArrayMixin
from solo.admin import SingletonModelAdmin

from .forms import OpenIDConnectConfigForm
from .models import OpenIDConnectConfig


@admin.register(OpenIDConnectConfig)
class OpenIDConnectConfigAdmin(DynamicArrayMixin, SingletonModelAdmin):
class OpenIDConnectConfigAdmin(SingletonModelAdmin):
form = OpenIDConnectConfigForm
fieldsets = (
(
Expand Down
1 change: 1 addition & 0 deletions mozilla_django_oidc_db/apps.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@

class MozillaDjangoOidcDbConfig(AppConfig):
name = "mozilla_django_oidc_db"
default_auto_field = "django.db.models.AutoField"
4 changes: 2 additions & 2 deletions mozilla_django_oidc_db/migrations/0001_initial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from django.db import migrations, models

import django_better_admin_arrayfield.models.fields
import django_jsonform.models.fields

import mozilla_django_oidc_db.models

Expand Down Expand Up @@ -60,7 +60,7 @@ class Migration(migrations.Migration):
),
(
"oidc_rp_scopes_list",
django_better_admin_arrayfield.models.fields.ArrayField(
django_jsonform.models.fields.ArrayField(
base_field=models.CharField(
max_length=50, verbose_name="OpenID Connect scope"
),
Expand Down
4 changes: 2 additions & 2 deletions mozilla_django_oidc_db/migrations/0007_auto_20220307_1128.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from django.db import migrations, models

import django_better_admin_arrayfield.models.fields
import django_jsonform.models.fields


class Migration(migrations.Migration):
Expand All @@ -14,7 +14,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name="openidconnectconfig",
name="oidc_exempt_urls",
field=django_better_admin_arrayfield.models.fields.ArrayField(
field=django_jsonform.models.fields.ArrayField(
base_field=models.CharField(max_length=1000, verbose_name="Exempt URL"),
blank=True,
default=list,
Expand Down
4 changes: 2 additions & 2 deletions mozilla_django_oidc_db/migrations/0012_openidconnectconfig_superuser_group_names.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from django.db import migrations, models

import django_better_admin_arrayfield.models.fields
import django_jsonform.models.fields


class Migration(migrations.Migration):
Expand All @@ -17,7 +17,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name="openidconnectconfig",
name="superuser_group_names",
field=django_better_admin_arrayfield.models.fields.ArrayField(
field=django_jsonform.models.fields.ArrayField(
base_field=models.CharField(
max_length=50, verbose_name="Superuser group name"
),
Expand Down
2 changes: 1 addition & 1 deletion mozilla_django_oidc_db/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from django.utils.encoding import force_str
from django.utils.translation import gettext_lazy as _

from django_better_admin_arrayfield.models.fields import ArrayField
from django_jsonform.models.fields import ArrayField
from solo.models import SingletonModel, get_cache

import mozilla_django_oidc_db.settings as oidc_settings
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ include_package_data = True
packages = find:
install_requires =
Django >=3.2
django-better-admin-arrayfield
django-jsonform
django-solo
glom
mozilla-django-oidc >=2.0.0
Expand Down
2 changes: 1 addition & 1 deletion testapp/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"django.contrib.messages",
"django.contrib.admin",
"solo",
"django_better_admin_arrayfield",
"django_jsonform",
"mozilla_django_oidc",
"mozilla_django_oidc_db",
"testapp",
Expand Down
Loading