Changeset 232:7b4b4d05de94

Timestamp:

09/11/10 16:51:08 (3 years ago)

Author:

nicoechaniz <nico@…>

Branch:

default

Message:

added default view to Collection

Files:

• cyclope/core/collections/admin.py (modified) (2 diffs)
• cyclope/core/collections/frontend_views.py (modified) (3 diffs)
• cyclope/core/collections/migrations/0003_auto__add_field_collection_default_list_view.py (added)
• cyclope/core/collections/models.py (modified) (1 diff)
• cyclope/core/frontend/__init__.py (modified) (1 diff)
• cyclope/core/frontend/sites.py (modified) (1 diff)
• demo/cyclope_project/db/site.db (modified) (previous)

cyclope/core/collections/admin.py

@@ -1 +1 @@
 #!/usr/bin/env python
-# -*- coding: UTF-8 -*-
+# -*- coding: utf-8 -*-
 #
 # Copyright 2010 Código Sur - Nuestra América Asoc. Civil / Fundación Pacificar.
@@ -186 +186 @@
 class CollectionAdminForm(forms.ModelForm):
     raw_id_fields = ['picture',]
+    default_list_view = forms.ChoiceField(label=_('Default category listing view'), required=False)
 
     def __init__(self, *args, **kwargs):
         super(CollectionAdminForm, self).__init__(*args, **kwargs)
         self.fields['content_types'].choices = frontend.site.get_base_ctype_choices()
+        model = get_model('collections', 'category')
+        views = [('', '------')] + [ (view.name, view.verbose_name)
+                                     for view in frontend.site._registry[model]
+                                     if view.name != 'default']
+        self.fields['default_list_view'].choices = views
 
     class Meta:

cyclope/core/collections/frontend_views.py

@@ -52 +52 @@
 frontend.site.register_view(Category, CategoryRootItemsList)
 
+class CategoryDefaultList(frontend.FrontendView):
+    name = 'default'
+    verbose_name = _('default view for the Collection')
+    is_default = True
+    is_content_view = True
+    
+    def get_response(self, request, host_template, content_object):
+        category = content_object
+        if category.collection.default_list_view not in ["", self.name]:
+            view_name = category.collection.default_list_view
+            view = frontend.site.get_view(content_object.__class__, view_name)
+        else:
+            view = frontend.site.get_view(content_object.__class__, 'teaser_list')
+        return view.get_response(request, host_template, content_object)
+
+frontend.site.register_view(Category, CategoryDefaultList)
+
 
 class CategoryTeaserList(frontend.FrontendView):
     """A teaser list view of Category members.
     """
-    name='teaser_list'
-    verbose_name=_('teaser list of Category members')
-    is_default = True
+    name = 'teaser_list'
+    verbose_name = _('teaser list of Category members')
     items_per_page = cyc_settings.CYCLOPE_PAGINATION['TEASER']
     is_content_view = True
@@ -68 +84 @@
         category = content_object
         categorizations_list = category.categorizations.all()
-
         paginator = Paginator(categorizations_list, self.items_per_page)
 
@@ -159 +174 @@
     name='categories_hierarchy'
     verbose_name=_('hierarchical list of Categories in a Collection')
-    target_view = 'teaser_list'
+    target_view = 'default'
     is_content_view = True
     is_region_view = True

cyclope/core/collections/models.py

@@ -54 +54 @@
     image =  FileBrowseField(_('image'), max_length=250, format='Image',
                              blank=True)
+    default_list_view = models.CharField(_('default list view'), max_length=255,
+                                    blank=True, default='')
 
     def get_absolute_url(self):

cyclope/core/frontend/__init__.py

@@ -27 +27 @@
 
 from django.http import HttpResponse
+from django.utils.translation import ugettext_lazy as _
 
 from sites import site
-from django.utils.translation import ugettext_lazy as _
 
 from cyclope.utils import template_for_request

cyclope/core/frontend/sites.py

@@ -94 +94 @@
         )
 
-        #TODO(nicoechaniz): Fix for multi-site ?
         # url patterns for registered views
         for model, model_views in self._registry.items():
             for view in model_views:
                 url_pattern = view.get_url_pattern(model)
-                urlpatterns += patterns(
-                    '',
-                    url(url_pattern,
-                    view,
-                    name="%s-%s" %
-                    (model._meta.object_name.lower(), view.name) )
-                )
+                model_name = model._meta.object_name.lower()
+                url_name = "%s-%s" % (model_name, view.name)
+                urlpatterns += patterns('', url(url_pattern, view, name=url_name))
+                if view.is_default:
+                    urlpatterns += patterns('', url(url_pattern, view, name=model_name))
+                
         # url patterns for menu items
         return self.get_menuitem_urls(urlpatterns)