Przeglądaj źródła

Remove treebeard (temporarily) from the default core apps.

The treebeard admin templatetags are not yet compatible with Django 1.9,
workaround issues by simply removing it from `INSTALLED_APPS`.
master
Michael van Tellingen 10 lat temu
rodzic
commit
b1477bf247
2 zmienionych plików z 3 dodań i 5 usunięć
  1. 1
    1
      src/oscar/__init__.py
  2. 2
    4
      src/oscar/apps/catalogue/admin.py

+ 1
- 1
src/oscar/__init__.py Wyświetl plik

@@ -61,7 +61,7 @@ OSCAR_CORE_APPS = [
61 61
     'oscar.apps.dashboard.shipping',
62 62
     # 3rd-party apps that oscar depends on
63 63
     'haystack',
64
-    'treebeard',
64
+    # 'treebeard',
65 65
     'sorl.thumbnail',
66 66
     'django_tables2',
67 67
 ]

+ 2
- 4
src/oscar/apps/catalogue/admin.py Wyświetl plik

@@ -1,6 +1,4 @@
1 1
 from django.contrib import admin
2
-from treebeard.admin import TreeAdmin
3
-from treebeard.forms import movenodeform_factory
4 2
 
5 3
 from oscar.core.loading import get_model
6 4
 
@@ -84,8 +82,8 @@ class AttributeOptionGroupAdmin(admin.ModelAdmin):
84 82
     inlines = [AttributeOptionInline, ]
85 83
 
86 84
 
87
-class CategoryAdmin(TreeAdmin):
88
-    form = movenodeform_factory(Category)
85
+class CategoryAdmin(admin.ModelAdmin):
86
+    list_display = ('name', 'slug')
89 87
 
90 88
 
91 89
 admin.site.register(ProductClass, ProductClassAdmin)

Ładowanie…
Anuluj
Zapisz