Changeset 268:c5db26a54ab8

Timestamp:

11/12/10 20:36:12 (2 years ago)

Author:

nicoechaniz <nico@…>

Branch:

default

Message:

return default view when a model's view has been renamed or deleted in code.

File:

• cyclope/core/frontend/sites.py (modified) (4 diffs)

cyclope/core/frontend/sites.py

@@ -116 +116 @@
                 obj = item.content_object
                 view = self.get_view(obj.__class__, item.content_view)
-                urlpatterns += patterns(
-                    '', url('^%s$' % item.url, view, {'slug': obj.slug}))
+                urlpatterns += patterns('', url('^%s$' % item.url, view,
+                                                   {'slug': obj.slug}))
             elif item.content_type is not None:
                 mdl = item.content_type.model_class()
                 view = self.get_view(mdl, item.content_view)
-                urlpatterns += patterns(
-                    '', url('^%s$' % item.url, view))
+                urlpatterns += patterns('', url('^%s$' % item.url, view))
+                
             # this menu item has no content so we will only display the layout
             else:
-                urlpatterns += patterns(
-                    '', url(r'^%s$' % item.url, self.no_content_layout_view))
+                urlpatterns += patterns('', url(r'^%s$' % item.url,
+                                                   self.no_content_layout_view))
         return urlpatterns
 
@@ -136 +136 @@
 
     def get_view(self, model, view_name):
-        return [ view for view in self._registry[model]
-                if view.name == view_name ][0]
+        view_ocurrences = [ view for view in self._registry[model]
+                            if view.name == view_name ]
+        # if a view's name has changed this will be False
+        # we return the default view to avoid the site from breaking
+        if view_ocurrences:
+            return view_ocurrences[0]
+        else:
+            return [ view for view in self._registry[model]
+                     if view.is_default == True ][0]
 
 #### Site Views ####
-#
+
     def index(self, request):
         """The root Cyclope URL view"""
@@ -186 +193 @@
 
 
-### JSON ##
+#### JSON ####
 
     def collection_categories_json(self, request):
@@ -282 +289 @@
         return HttpResponse(json_data, mimetype='application/json')
 
-#
 ####