Changeset 663:ecfdfb0a5037

Timestamp:

17/07/12 21:06:32 (10 months ago)

Author:

Santiago Piccinini (SAn) <spiccinini@…>

Branch:

default

Message:

Fixed bug on view_options introduced on d6375ab9ac12

Location:

cyclope

Files:

• core/collections/admin.py (modified) (1 diff)
• forms.py (modified) (4 diffs)

cyclope/core/collections/admin.py

@@ -240 +240 @@
 
         if self.instance.id is not None:
-            collection = self.instance
-            view_name = collection.default_list_view
-            view = site.get_view(Category, view_name)
-            self.fields["view_options"] = MultipleField(form=view.options_form, required=False)
-            initial_options = self.fields["view_options"].initial
-            self.initial["view_options"] = collection.view_options or initial_options
+            self.set_initial_view_options(self.instance)
 
     class Meta:

cyclope/forms.py

@@ -75 +75 @@
     model = None
 
-    def get_initial(self, view, fields):
-        fields[self.options_field_name] = MultipleField(form=view.options_form,
-                                                        required=False)
+    def set_initial_view_options(self, content_object):
+        view_name = getattr(content_object, self.view_field_name)
+        view = site.get_view(content_object, view_name)
+
+        self.fields[self.options_field_name] = MultipleField(form=view.options_form,
+                                                             required=False)
+
         initial_options = self.fields[self.options_field_name].initial
+        actual_options = getattr(content_object, self.options_field_name)
+        self.initial[self.options_field_name] = actual_options or initial_options
 
     def get_view(self, values):
@@ -106 +112 @@
         return cleaned_value
 
+
 class MenuItemAdminForm(forms.ModelForm, ViewOptionsFormMixin):
     # content_view choices get populated through javascript
@@ -128 +135 @@
                                                     selected_view)]
             if menu_item.content_type:
-                view_name = menu_item.content_view
-                model = menu_item.content_type.model_class()
-                view = site.get_view(model, view_name)
-
-                initial_options = self.get_initial(view, self.fields)
-                self.initial[self.options_field_name] = menu_item.view_options or \
-                                                        initial_options
+                self.set_initial_view_options(menu_item)
 
             if menu_item.content_object:
@@ -249 +250 @@
                                                         selected_view)]
             if region_view.content_type:
-                view_name = region_view.content_view
-                model = region_view.content_type.model_class()
-                view = site.get_view(model, view_name)
-
-                self.fields["view_options"] = MultipleField(form=view.options_form, required=False)
-                initial_options = self.fields["view_options"].initial
-                self.initial["view_options"] = region_view.view_options or initial_options
+                self.set_initial_view_options(region_view)
 
             if region_view.content_object: