From 6ee336cc60c081cf53fb94fdce1e1d38ef8fec49 Mon Sep 17 00:00:00 2001
From: David Saenz Tagarro <david.saenz.tagarro@gmail.com>
Date: Sun, 9 Nov 2014 14:32:30 +0000
Subject: [PATCH] Fixed media url conflicts

---
 .../media/templates/media/article/index.html  |  2 +-
 .../tests/integration/achieved/__init__.py    |  0
 .../test_article_achieved_by_year.py          |  2 +-
 cirujanos/apps/media/urls.py                  | 40 ++++++-------------
 cirujanos/urls.py                             |  3 +-
 5 files changed, 17 insertions(+), 30 deletions(-)
 create mode 100644 cirujanos/apps/media/tests/integration/achieved/__init__.py
 rename cirujanos/apps/media/tests/integration/{ => achieved}/test_article_achieved_by_year.py (98%)

diff --git a/cirujanos/apps/media/templates/media/article/index.html b/cirujanos/apps/media/templates/media/article/index.html
index bb272f2..d2d7c6e 100644
--- 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
new file mode 100644
index 0000000..e69de29
diff --git a/cirujanos/apps/media/tests/integration/test_article_achieved_by_year.py b/cirujanos/apps/media/tests/integration/achieved/test_article_achieved_by_year.py
similarity index 98%
rename from cirujanos/apps/media/tests/integration/test_article_achieved_by_year.py
rename to cirujanos/apps/media/tests/integration/achieved/test_article_achieved_by_year.py
index bc6652e..5e3347d 100644
--- a/cirujanos/apps/media/tests/integration/test_article_achieved_by_year.py
+++ b/cirujanos/apps/media/tests/integration/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
index 697e28f..fbffa6c 100644
--- 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
index 2ed3709..ab62761 100644
--- 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')),