Merge branch 'master' into lqc-trunk

[redakcja.git] / apps / explorer / admin.py

diff --git a/apps/explorer/admin.py b/apps/explorer/admin.py
index c84a5d9..dd765f5 100644 (file)
--- a/apps/explorer/admin.py
+++ b/apps/explorer/admin.py
@@ -1,29 +1,13 @@
 from django.contrib import admin
-from django import forms
-import os
-
-from django.conf import settings
 
 import explorer.models
+from explorer import forms
 
 admin.site.register(explorer.models.EditorSettings)
 admin.site.register(explorer.models.EditorPanel)
 
-
-class GalleryAdminForm(forms.ModelForm):
-    subpath = forms.ChoiceField(choices=())
-    
-    def __init__(self, *args, **kwargs):
-        super(GalleryAdminForm, self).__init__(*args, **kwargs)
-        self.fields['subpath'].choices = [(settings.IMAGE_DIR + '/' + x, x) for x in os.listdir(settings.MEDIA_ROOT + settings.IMAGE_DIR)]
-        
-    class Meta:
-        mode = explorer.models.GalleryForDocument
-        fields = ('document', 'subpath',)
-
-
 class GalleryAdmin(admin.ModelAdmin):
-    form = GalleryAdminForm
+    form = forms.GalleryChoiceForm
     list_display = ('document', 'subpath',)
     search_fields = ('document', 'subpath',)