mirror of
https://github.com/haiwen/seahub.git
synced 2025-10-21 10:51:17 +00:00
django 4.2
This commit is contained in:
@@ -3,7 +3,6 @@ from . import checks
|
||||
|
||||
__version__ = '2.4.0'
|
||||
|
||||
default_app_config = 'constance.apps.ConstanceConfig'
|
||||
|
||||
|
||||
class LazyConfig(LazyObject):
|
||||
|
@@ -6,7 +6,7 @@ import hashlib
|
||||
|
||||
from django import forms, VERSION, conf
|
||||
from django.apps import apps
|
||||
from django.conf.urls import url
|
||||
from django.urls import path
|
||||
from django.contrib import admin, messages
|
||||
from django.contrib.admin import widgets
|
||||
from django.contrib.admin.options import csrf_protect_m
|
||||
@@ -19,7 +19,7 @@ from django.utils import timezone
|
||||
from django.utils.encoding import smart_bytes
|
||||
from django.utils.formats import localize
|
||||
from django.utils.module_loading import import_string
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
import six
|
||||
|
||||
from . import LazyConfig, settings
|
||||
@@ -175,6 +175,7 @@ class ConstanceForm(forms.Form):
|
||||
return cleaned_data
|
||||
|
||||
|
||||
@admin.register(Config)
|
||||
class ConstanceAdmin(admin.ModelAdmin):
|
||||
change_list_template = 'admin/constance/change_list.html'
|
||||
change_list_form = ConstanceForm
|
||||
@@ -182,10 +183,10 @@ class ConstanceAdmin(admin.ModelAdmin):
|
||||
def get_urls(self):
|
||||
info = self.model._meta.app_label, self.model._meta.module_name
|
||||
return [
|
||||
url(r'^$',
|
||||
path('',
|
||||
self.admin_site.admin_view(self.changelist_view),
|
||||
name='%s_%s_changelist' % info),
|
||||
url(r'^$',
|
||||
path('',
|
||||
self.admin_site.admin_view(self.changelist_view),
|
||||
name='%s_%s_add' % info),
|
||||
]
|
||||
@@ -327,4 +328,3 @@ class Config(object):
|
||||
_meta = Meta()
|
||||
|
||||
|
||||
admin.site.register([Config], ConstanceAdmin)
|
||||
|
@@ -1,5 +1,5 @@
|
||||
from django.db.models import signals
|
||||
from django.apps import AppConfig
|
||||
from django.apps import apps, AppConfig
|
||||
|
||||
|
||||
class ConstanceConfig(AppConfig):
|
||||
@@ -17,13 +17,17 @@ class ConstanceConfig(AppConfig):
|
||||
to be able to check for permissions
|
||||
"""
|
||||
from django.conf import settings
|
||||
from django.contrib.auth.models import Permission
|
||||
from django.contrib.contenttypes.models import ContentType
|
||||
|
||||
constance_dbs = getattr(settings, 'CONSTANCE_DBS', None)
|
||||
if constance_dbs is not None and using not in constance_dbs:
|
||||
return
|
||||
if ContentType._meta.installed and Permission._meta.installed:
|
||||
|
||||
if (
|
||||
apps.is_installed('django.contrib.contenttypes') and
|
||||
apps.is_installed('django.contrib.auth')
|
||||
):
|
||||
ContentType = apps.get_model('contenttypes.ContentType')
|
||||
Permission = apps.get_model('auth.Permission')
|
||||
content_type, created = ContentType.objects.using(using).get_or_create(
|
||||
app_label='constance',
|
||||
model='config',
|
||||
|
@@ -16,7 +16,7 @@ class DatabaseBackend(Backend):
|
||||
self._autofill_timeout = settings.DATABASE_CACHE_AUTOFILL_TIMEOUT
|
||||
self._autofill_cachekey = 'autofilled'
|
||||
|
||||
if not self._model._meta.installed:
|
||||
if self._model._meta.app_config is None:
|
||||
raise ImproperlyConfigured(
|
||||
"The constance.backends.database app isn't installed "
|
||||
"correctly. Make sure it's in your INSTALLED_APPS setting.")
|
||||
|
@@ -1,7 +1,7 @@
|
||||
from django.db import models
|
||||
from django.core.exceptions import ImproperlyConfigured
|
||||
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
try:
|
||||
from picklefield import PickledObjectField
|
||||
|
@@ -1,5 +1,5 @@
|
||||
from django.core import checks
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
from . import settings
|
||||
|
||||
|
@@ -4,7 +4,7 @@ from __future__ import unicode_literals
|
||||
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.core.management import BaseCommand, CommandError
|
||||
from django.utils.translation import ugettext as _
|
||||
from django.utils.translation import gettext as _
|
||||
from django import VERSION
|
||||
|
||||
|
||||
|
@@ -1,5 +1,3 @@
|
||||
import django.dispatch
|
||||
from django.dispatch import Signal
|
||||
|
||||
config_updated = django.dispatch.Signal(
|
||||
providing_args=['key', 'old_value', 'new_value']
|
||||
)
|
||||
config_updated = Signal()
|
||||
|
Reference in New Issue
Block a user