MAJ : MAJ 2.1, remove user urls

equipment/admin.py

@@ -4,8 +4,6 @@ from django import forms
 from .models import Equipment, EquipmentDefault, EquipmentRevision, EquipmentCategory, EquipmentLost, EquipmentAttributeValue, EquipmentAttribute
 from .fields import IdField, IdWidget
 
-from shared.admin import admin_site
-
 
 class IdForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
@@ -120,7 +118,6 @@ class EquipmentAdmin(admin.ModelAdmin):
     list_filter = ['owner', 'category' ]
 
 
-admin_site.register(Equipment, EquipmentAdmin)
-admin_site.register(EquipmentCategory, CategoryAdmin)
-admin_site.register(EquipmentAttribute, EquipmentAttributeAdmin)
 admin.site.register(Equipment, EquipmentAdmin)
+admin.site.register(EquipmentCategory, CategoryAdmin)
+admin.site.register(EquipmentAttribute, EquipmentAttributeAdmin)

event/admin.py

@@ -1,5 +1,4 @@
 from django.contrib import admin
-from shared.admin import admin_site
 
 from .models import Event, Place, ActivityTag, Activity, ActivityTemplate  # TODO add me
 from equipment.models import EquipmentAttribution
@@ -90,8 +89,8 @@ class ActivityAdmin(admin.ModelAdmin):
             )
 
 
-admin_site.register(Event, EventAdmin)
-admin_site.register(Place, PlaceAdmin)
-admin_site.register(ActivityTag, ActivityTagAdmin)
-admin_site.register(ActivityTemplate, ActivityTemplateAdmin)
-admin_site.register(Activity, ActivityAdmin)
+admin.site.register(Event, EventAdmin)
+admin.site.register(Place, PlaceAdmin)
+admin.site.register(ActivityTag, ActivityTagAdmin)
+admin.site.register(ActivityTemplate, ActivityTemplateAdmin)
+admin.site.register(Activity, ActivityAdmin)

poulpe/settings/common.py

@@ -47,7 +47,8 @@ BASE_DIR = os.path.dirname(
 
 
 INSTALLED_APPS = [
-    'shared.apps.CustomAdminConfig',
+    # 'shared.apps.CustomAdminConfig',
+    'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',

poulpe/urls.py

@@ -8,19 +8,17 @@ from django.contrib import admin
 #from django_cas_ng import views as django_cas_views
 from allauth_ens.views import capture_login, capture_logout
 
-from shared.admin import admin_site
-
 
 urlpatterns = [
     url(r'^admin/login/$', capture_login),
     url(r'^admin/logout/$', capture_logout),
     url(r'^compte/', include('allauth.urls')),
     # Admin
-    url(r'^admin/', admin_site.urls),
+    url(r'^admin/', admin.site.urls),
     # Apps
     url(r'^equipment/', include('equipment.urls')),
     url(r'^event/', include('event.urls')),
-    url(r'^user/', include('users.urls')),
+    #url(r'^user/', include('users.urls')),
     # REST
     url(r'^api/', include('api.urls')),
     # Reste

requirements.txt

@@ -2,14 +2,14 @@ asgi-redis==1.3.0
 asgiref==1.1.1
 django-bootstrap3==10.0.1
 channels==1.1.5
-Django==2.0
+Django==2.1
 django-allauth==0.36.0
 django-allauth-cas==1.0.0b2
 django-tables2==2.0.0a2
 django-filter==2.0.0
 #git+https://git.eleves.ens.fr/cof-geek/django-allauth-ens@6e77b31e0dfed7659776d
 git+https://git.eleves.ens.fr/cof-geek/django-allauth-ens@30a072b7db1fc2d4652284227a3e7e876b14c915
-django-bootstrap-form==3.2.1
+django-bootstrap-form==3.4
 drf-nested-routers==0.90.0
 django-notifications==0.1.dev0
 django-contrib-comments==1.8.0

shared/admin.py

@@ -28,9 +28,7 @@ class CustomAdminSite(AdminSite):
         return super().index(request, extra_context)
 
 
-admin_site = CustomAdminSite(name='admin')
-admin_site.register(User, UserAdmin)
-admin_site.register(Group, GroupAdmin)
-admin_site.register(Site, SiteAdmin)
-
+# admin.site = CustomAdminSite(name='admin')
 admin.site.register(User, UserAdmin)
+# admin.site.register(Group, GroupAdmin)
+# admin.site.register(Site, SiteAdmin)

shared/apps.py

@@ -2,9 +2,9 @@ from django.apps import AppConfig
 from django.contrib.admin.apps import AdminConfig
 
 
-class CustomAdminConfig(AdminConfig):
-    default_site = 'myproject.admin.CustomAdminSite'
-
-
 class SharedConfig(AppConfig):
     name = 'shared'
+
+
+class CustomAdminConfig(AdminConfig):
+    default_site = 'shared.admin.CustomAdminSite'