Editor fix

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

diff --git a/apps/toolbar/admin.py b/apps/toolbar/admin.py
index 58b5f74..283ab78 100644 (file)
--- a/apps/toolbar/admin.py
+++ b/apps/toolbar/admin.py
@@ -5,36 +5,26 @@ from django.utils import simplejson as json
 
 from toolbar import models
 
 
 from toolbar import models
 

-#class ButtonGroupAdmin(admin.ModelAdmin):
-#    list_display = ('name', 'slug', 'position',)
-#    search_fields = ('name', 'slug',)
-#    prepopulated_fields = {'slug': ('name',)}
-#    list_editable = ('position',)
-

 
 class ButtonAdminForm(forms.ModelForm):
 
 class ButtonAdminForm(forms.ModelForm):

-    model = models.Button
+    class Meta:
+        model = models.Button

 
     def clean_params(self):
         value = self.cleaned_data['params']
         try:
             return json.dumps(json.loads(value))
 
     def clean_params(self):
         value = self.cleaned_data['params']
         try:
             return json.dumps(json.loads(value))

-        except Exception, e:
+        except ValueError, e:

             raise forms.ValidationError(e)
 
             raise forms.ValidationError(e)
 

+

 class ButtonAdmin(admin.ModelAdmin):
     form = ButtonAdminForm
 class ButtonAdmin(admin.ModelAdmin):
     form = ButtonAdminForm

-    list_display = ('label', 'scriptlet', 'key', 'params')
+    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)
     prepopulated_fields = {'slug': ('label',)}
 
 admin.site.register(models.Button, ButtonAdmin)
 admin.site.register(models.ButtonGroup)
 admin.site.register(models.Scriptlet)

-
-#class ButtonAdmin(admin.ModelAdmin):
-#    list_display = ('label', 'action', 'key', 'position',)
-#    list_filter = ('group',)
-#    search_fields = ('label', 'action', 'key',)
-#    filter_horizontal = ('group',)
-#    list_editable = ('position',)
-