From eed8f993161cf3549ca11e47383e751b371dd118 Mon Sep 17 00:00:00 2001
From: erichhasl <erich.hasl@gmail.com>
Date: Wed, 5 Jul 2017 19:34:49 +0200
Subject: [PATCH] replace stackedinlines with tabularinlines

---
 jdav_web/mailer/admin.py   |  5 ++++-
 jdav_web/material/admin.py | 30 ++++++++++++++++--------------
 jdav_web/members/admin.py  | 10 ++++++++--
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/jdav_web/mailer/admin.py b/jdav_web/mailer/admin.py
index 78b5076..d84a9a2 100644
--- a/jdav_web/mailer/admin.py
+++ b/jdav_web/mailer/admin.py
@@ -10,7 +10,7 @@ from .models import Message, Attachment, MessageForm
 from .mailutils import NOT_SENT, PARTLY_SENT
 
 
-class AttachmentInline(admin.StackedInline):
+class AttachmentInline(admin.TabularInline):
     model = Attachment
     extra = 0
 
@@ -52,6 +52,9 @@ class MessageAdmin(admin.ModelAdmin):
             submit_message(obj, request)
         return super(MessageAdmin, self).response_add(request, obj)
 
+    class Media:
+        css = {'all': ('admin/css/tabular_hide_original.css',)}
+
 
 def submit_message(msg, request):
     success = msg.submit()
diff --git a/jdav_web/material/admin.py b/jdav_web/material/admin.py
index c6228b4..31198a1 100644
--- a/jdav_web/material/admin.py
+++ b/jdav_web/material/admin.py
@@ -9,7 +9,7 @@ from easy_select2 import apply_select2
 
 
 # Register your models here.
-class OwnershipInline(admin.StackedInline):
+class OwnershipInline(admin.TabularInline):
     """
     This shows the ownership selection directly in the MaterialPart edit
     view
@@ -22,21 +22,20 @@ class OwnershipInline(admin.StackedInline):
 
 
 class NotTooOldFilter(SimpleListFilter):
-	title = _('Age')
-	parameter_name = 'age'
+    title = _('Age')
+    parameter_name = 'age'
 
-	def lookups(self, request, model_admin):
-		return (
-        	('too_old', _('Not too old')),
-        	('not_too_old', _('Too old')),
-		)
-
-	def queryset(self, request, queryset):
-		if self.value() == 'too_old':
-			return queryset.filter(pk__in=[x.pk for x in queryset.all() if x.not_too_old()])
-		if self.value() == 'not_too_old':
-			return queryset.filter(pk__in=[x.pk for x in queryset.all() if not x.not_too_old()])
+    def lookups(self, request, model_admin):
+        return (
+            ('too_old', _('Not too old')),
+            ('not_too_old', _('Too old')),
+        )
 
+    def queryset(self, request, queryset):
+        if self.value() == 'too_old':
+            return queryset.filter(pk__in=[x.pk for x in queryset.all() if x.not_too_old()])
+        if self.value() == 'not_too_old':
+            return queryset.filter(pk__in=[x.pk for x in queryset.all() if not x.not_too_old()])
 
 
 class MaterialAdmin(admin.ModelAdmin):
@@ -48,5 +47,8 @@ class MaterialAdmin(admin.ModelAdmin):
     inlines = [OwnershipInline]
     list_filter = (NotTooOldFilter,)
 
+    class Media:
+        css = {'all': ('admin/css/tabular_hide_original.css',)}
+
 
 admin.site.register(MaterialPart, MaterialAdmin)
diff --git a/jdav_web/members/admin.py b/jdav_web/members/admin.py
index 22a32ad..bd78be1 100644
--- a/jdav_web/members/admin.py
+++ b/jdav_web/members/admin.py
@@ -71,7 +71,7 @@ class MemberListAdminForm(forms.ModelForm):
         #self.fields['add_member'].queryset = Member.objects.filter(prename__startswith='F')
 
 
-class MemberOnListInline(admin.StackedInline):
+class MemberOnListInline(admin.TabularInline):
     model = MemberOnList
     extra = 0
     formfield_overrides = {
@@ -92,6 +92,9 @@ class MemberListAdmin(admin.ModelAdmin):
         ForeignKey: {'widget': apply_select2(forms.Select)}
     }
 
+    class Media:
+        css = {'all': ('admin/css/tabular_hide_original.css',)}
+
     def __init__(self, *args, **kwargs):
         super(MemberListAdmin, self).__init__(*args, **kwargs)
 
@@ -311,7 +314,7 @@ class KlettertreffAttendeeInlineForm(forms.ModelForm):
         self.fields['member'].queryset = Member.objects.filter(group__name='J1')
     """
 
-class KlettertreffAttendeeInline(admin.StackedInline):
+class KlettertreffAttendeeInline(admin.TabularInline):
     model = KlettertreffAttendee
     form = KlettertreffAttendeeInlineForm
     extra = 0
@@ -351,6 +354,9 @@ class KlettertreffAdmin(admin.ModelAdmin):
         ForeignKey: {'widget': apply_select2(forms.Select)}
     }
 
+    class Media:
+        css = {'all': ('admin/css/tabular_hide_original.css',)}
+
 
 admin.site.register(Member, MemberAdmin)
 admin.site.register(Group, GroupAdmin)