Fixed media url conflicts

dsaenztagarro · Nov 9, 2014 · 6ee336c · 6ee336c
1 parent 1f71a63
commit 6ee336c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 30 deletions.
diff --git a/cirujanos/apps/media/templates/media/article/index.html b/cirujanos/apps/media/templates/media/article/index.html
@@ -16,7 +16,7 @@ <h3>{% trans "articles" %}</h3>
         {% else %}
           <li class="separator">/</li>
         {% endif %}
-        <a id="year_{{year}}" href="{% url 'media:articles' year %}">{{year}}</a>
+        <a id="year_{{year}}" href="{% url 'media:articles_year' year %}">{{year}}</a>
       {% endfor %}
     {% endif %}
 

diff --git a/cirujanos/apps/media/tests/integration/achieved/__init__.py b/cirujanos/apps/media/tests/integration/achieved/__init__.py
diff --git a/...egration/test_article_achieved_by_year.py → ...achieved/test_article_achieved_by_year.py b/...egration/test_article_achieved_by_year.py → ...achieved/test_article_achieved_by_year.py
@@ -2,7 +2,7 @@
 from cirujanos.apps.media.extensions import Publication
 from cirujanos.tests.support.integration import IntegrationTestCase
 from django.utils.translation import ugettext as _
-from ..support import factories as f
+from ...support import factories as f
 from datetime import datetime, timedelta
 
 

diff --git a/cirujanos/apps/media/urls.py b/cirujanos/apps/media/urls.py
@@ -9,7 +9,7 @@
     SlideView,
     VideoView,
 )
-from models import Article, Video, Event, Slide
+# from models import Article, Video, Event, Slide
 
 urlpatterns = patterns(
     '',
@@ -25,30 +25,16 @@
         name='download'),
 )
 
-if Article.isAchievedByYear():
-    urlpatterns += patterns(
-        '',
-        url(r'^articles/(?P<publish_year>\d{4})/$',
-            ArticleView.as_view(), name="articles"),
-    )
-
-if Video.isAchievedByYear():
-    urlpatterns += patterns(
-        '',
-        url(r'^videos/(?P<publish_year>\d{4})/$',
-            VideoView.as_view(), name="videos"),
-    )
-
-if Event.isAchievedByYear():
-    urlpatterns += patterns(
-        '',
-        url(r'^events/(?P<publish_year>\d{4})/$',
-            EventView.as_view(), name="events"),
-    )
+# if Article.isAchievedByYear():
+urlpatterns += patterns(
+    '',
+    url(r'^articles/(?P<publish_year>\d{4})/$',
+        ArticleView.as_view(), name="articles_year"),
+)
 
-if Slide.isAchievedByYear():
-    urlpatterns += patterns(
-        '',
-        url(r'^slides/(?P<publish_year>\d{4})/$',
-            SlideView.as_view(), name="slides"),
-    )
+# if Video.isAchievedByYear():
+urlpatterns += patterns(
+    '',
+    url(r'^videos/(?P<publish_year>\d{4})/$',
+        VideoView.as_view(), name="videos_year"),
+)
diff --git a/cirujanos/urls.py b/cirujanos/urls.py
@@ -11,7 +11,8 @@
     url(r'^$', lambda r: HttpResponseRedirect('home/')),
     url(r'^home/', include('cirujanos.apps.home.urls', namespace="home")),
     url(r'^web/', include('cirujanos.apps.web.urls')),
-    url(r'^media/', include('cirujanos.apps.media.urls', namespace="media")),
+    url(r'^multimedia/', include('cirujanos.apps.media.urls',
+                                 namespace="media")),
     url(r'^about/', include('cirujanos.apps.about.urls', namespace="about")),
     url(r'^robots\.txt$', TemplateView.as_view(template_name='robots.txt',
                                                content_type='text/plain')),