Changeset 215:307f33589e18

Timestamp:

13/10/10 13:12:54 (3 years ago)

Author:

nicoechaniz <nico@…>

Branch:

default

Message:

made creation_date editable in admin. removed wrong RSS results ordering until fixed

Files:

• .hgignore (modified) (1 diff)
• cyclope/apps/articles/admin.py (modified) (1 diff)
• cyclope/apps/articles/models.py (modified) (2 diffs)
• cyclope/apps/medialibrary/models.py (modified) (2 diffs)
• cyclope/core/collections/frontend_views.py (modified) (2 diffs)
• cyclope/feeds.py (modified) (3 diffs)
• cyclope/migrations/0009_move_image_data_to_picture.py (modified) (1 diff)
• cyclope/models.py (modified) (2 diffs)
• cyclope/tests.py (modified) (4 diffs)
• demo/cyclope_project/cyclope_project_index/_MAIN_301.dci (added)
• demo/cyclope_project/cyclope_project_index/_MAIN_301.dcz (added)
• demo/cyclope_project/cyclope_project_index/_MAIN_301.pst (added)
• demo/cyclope_project/cyclope_project_index/_MAIN_301.tiz (added)
• demo/cyclope_project/cyclope_project_index/_MAIN_302.toc (added)
• demo/cyclope_project/cyclope_project_index/_MAIN_48.dci (deleted)
• demo/cyclope_project/cyclope_project_index/_MAIN_48.dcz (deleted)
• demo/cyclope_project/cyclope_project_index/_MAIN_48.pst (deleted)
• demo/cyclope_project/cyclope_project_index/_MAIN_48.tiz (deleted)
• demo/cyclope_project/cyclope_project_index/_MAIN_49.toc (deleted)
• demo/cyclope_project/db/site.db (modified) (previous)

.hgignore

@@ -19 +19 @@
 django_cyclope.egg-info
 fulldb.json
+.emacs.desktop

cyclope/apps/articles/admin.py

@@ -64 +64 @@
                     'classes': ('collapse',),
                     'fields':('source', 'tags', 'pretitle',
-                              'summary', 'date', 'allow_comments')}),
+                              'summary', 'date', 'allow_comments', 'creation_date')}),
                 )
 

cyclope/apps/articles/models.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.
@@ -61 +61 @@
         verbose_name = _('article')
         verbose_name_plural = _('articles')
-        ordering = ('-modification_date', 'name')
+        ordering = ('-creation_date', 'name')
 

cyclope/apps/medialibrary/models.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.
@@ -39 +39 @@
     class Meta:
         abstract = True
+        ordering = ('-creation_date', 'name')
 
 

cyclope/core/collections/frontend_views.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.
@@ -68 +68 @@
     def get_string_response(self, request, content_object=None, *args, **kwargs):
         category = content_object
-        c = RequestContext(request,
-                           {'categorizations': category.categorizations.all(),
+        categorizations_list = category.categorizations.all()
+
+        c = RequestContext(request,
+                           {'categorizations': categorizations_list,
                             'region_view': True,
                             'category': category})

cyclope/feeds.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.
@@ -47 +47 @@
         objs = []
         for ctype in sites.site.base_content_types.keys():
-            objs.extend(list(ctype.objects.all().order_by('-creation_date')[:N]))
+            objs.extend(list(ctype.objects.all().order_by('-content_object__creation_date')[:N]))
         return sorted(objs, key=lambda x: x.creation_date, reverse = True)[:N]
 
@@ -76 +76 @@
         N = cyc_settings.CYCLOPE_RSS_LIMIT
         return [c.content_object for c in
-                category.categorizations.order_by('-creation_date')[:N]]
+                category.categorizations.all()[:N]]

cyclope/migrations/0009_move_image_data_to_picture.py

@@ -29 +29 @@
 
     def forwards(self, orm):
-        from cyclope.apps.articles.models import Article, ArticleImageData
-        from cyclope.apps.medialibrary.models import Picture
-        # we work with the actual models here because managing these generic relations with south is very complex
+        # we work with the actual models here because managing these generic relations with south is very complex and we won't be migrating backwards
+
+        try:
+            from cyclope.apps.articles.models import Article, ArticleImageData
+            from cyclope.apps.medialibrary.models import Picture
+        except:
+            return
+        
         for article in Article.objects.all():
             if article.images:

cyclope/models.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.
@@ -271 +271 @@
                                                object_id_field='self_id',
                                                content_type_field='self_type')
-    creation_date = models.DateTimeField(_('creation date'), auto_now_add=True,
-                                         editable=False, default=datetime.now())
+    creation_date = models.DateTimeField(_('creation date'),
+                                         editable=True, default=datetime.now())
     modification_date = models.DateTimeField(_('modification date'), auto_now=True,
                                              editable=False, default=datetime.now())

cyclope/tests.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.
@@ -35 +35 @@
 from cyclope.apps.articles.models import Article
 from cyclope.apps.medialibrary.models import *
+from cyclope.apps.polls.models import *
 
 def create_static_page(name=None):
@@ -268 +269 @@
 
     def test_creation(self):
-        Article.objects.create(name='An instance')
+        author = Author.objects.create(name="the author")
+        Article.objects.create(name='An instance', author=author)
         an_instance = Article.objects.get(slug='an-instance')
         self.assertEqual(an_instance.name, 'An instance')
 
     def test_content_views(self):
-        content_urls = get_content_urls(Article)
+        author = Author.objects.create(name="the author")
+        an_instance = Article.objects.create(name='An instance', author=author)
+        content_urls = get_content_urls(Article, an_instance)
         for url in content_urls:
             self.assertEqual(self.client.get(url).status_code, 200)
@@ -367 +371 @@
         for url in content_urls:
             self.assertEqual(self.client.get(url).status_code, 200)
+
+
+class PollTestCase(TestCase):
+    def setUp(self):
+        frontend.autodiscover()
+
+    def test_creation(self):
+        Poll.objects.create(name='An instance')
+        an_instance = Poll.objects.get(slug='an-instance')
+        self.assertEqual(an_instance.name, 'An instance')
+
+    def test_content_views(self):
+        content_urls = get_content_urls(Poll)
+        for url in content_urls:
+            self.assertEqual(self.client.get(url).status_code, 200)