minor fix for tests.

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

diff --git a/apps/toolbar/admin.py b/apps/toolbar/admin.py
index 8658d34..283ab78 100644 (file)
--- a/apps/toolbar/admin.py
+++ b/apps/toolbar/admin.py
@@ -1,20 +1,30 @@
 from django.contrib import admin
 from django.utils.translation import ugettext_lazy as _
+from django import forms
+from django.utils import simplejson as json
 
 from toolbar import models
 
-#class ButtonGroupAdmin(admin.ModelAdmin):
-#    list_display = ('name', 'slug', 'position',)
-#    search_fields = ('name', 'slug',)
-#    prepopulated_fields = {'slug': ('name',)}
-#    list_editable = ('position',)
-admin.site.register(models.ButtonGroup)
 
-#class ButtonAdmin(admin.ModelAdmin):
-#    list_display = ('label', 'action', 'key', 'position',)
-#    list_filter = ('group',)
-#    search_fields = ('label', 'action', 'key',)
-#    filter_horizontal = ('group',)
-#    list_editable = ('position',)
+class ButtonAdminForm(forms.ModelForm):
+    class Meta:
+        model = models.Button
+
+    def clean_params(self):
+        value = self.cleaned_data['params']
+        try:
+            return json.dumps(json.loads(value))
+        except ValueError, e:
+            raise forms.ValidationError(e)
+
 
-admin.site.register(models.Button)
+class ButtonAdmin(admin.ModelAdmin):
+    form = ButtonAdminForm
+    list_display = ('slug', 'label', 'tooltip', 'accesskey')
+    list_display_links = ('slug',)
+    list_editable = ('label', 'tooltip', 'accesskey')
+    prepopulated_fields = {'slug': ('label',)}
+
+admin.site.register(models.Button, ButtonAdmin)
+admin.site.register(models.ButtonGroup)
+admin.site.register(models.Scriptlet)