Fix blog post url resolving for displayable_links.js, partially re-add media detail...

diff --git a/app/local_settings.py b/app/local_settings.py
index de55255fadb2b1d3eda8099b44462934a59a7750..763359f6a71d73efde30c55e02aac8118edd81ed 100644 (file)
--- a/app/local_settings.py
+++ b/app/local_settings.py
@@ -189,6 +189,7 @@ TINYMCE_SETUP_JS = "/static/js/tinymce_setup.js"
 
 SLUGIFY = 'django.template.defaultfilters.slugify'
 
+BLOG_SLUG = 'article'
 BLOG_POST_PER_PAGE = 200
 ARTICLE_PER_PAGE = 10
 MEDIA_PER_PAGE = 9

diff --git a/app/organization/media/urls.py b/app/organization/media/urls.py
index 9ccd3320bccc295039763b356b102dd46c262b91..f99796db4c15fa287f88877303e4c38d488ec7d5 100644 (file)
--- a/app/organization/media/urls.py
+++ b/app/organization/media/urls.py
@@ -12,6 +12,7 @@ from organization.media.views import *
 
 
 urlpatterns = [
+    url("^media/deatil/(?P<slug>.*)/$", MediaDetailView.as_view(), name="organization-media-detail"),
     url("^playlist/list/$", PlaylistListView.as_view(), name="organization-playlist-list"),
     url("^playlist/list/(?P<type>.*)$", PlaylistListView.as_view(), name="organization-playlist-list"),
     url("^playlist/detail/(?P<slug>.*)/$", PlaylistDetailView.as_view(), name="organization-playlist-detail"),

diff --git a/app/organization/media/views.py b/app/organization/media/views.py
index e5d761617ed60caa4097d2993cca835b4c87fdd7..6a4ebcef113190599ecdb9fd3cad005debcdc3b6 100644 (file)
--- a/app/organization/media/views.py
+++ b/app/organization/media/views.py
@@ -9,6 +9,13 @@ from django.core.exceptions import FieldDoesNotExist
 # temporarily excluse not ready models
 EXCLUDED_MODELS = ("organizationplaylist", "personplaylist")
 
+
+class MediaDetailView(SlugMixin, DetailView):
+
+    model = Media
+    template_name='media/media_detail.html'
+
+
 class PlaylistDetailView(SlugMixin, DetailView):
 
     model = Playlist

diff --git a/app/urls.py b/app/urls.py
index e0a75b5263fc065e02a35b578e2bc16d97cf4d2d..2f24a87c2bd3b2e3174b8926f11658f7e7a4ba84 100644 (file)
--- a/app/urls.py
+++ b/app/urls.py
@@ -174,15 +174,15 @@ if "mezzanine.accounts" in settings.INSTALLED_APPS:
     ]
 
 # Mezzanine's Blog app.
-# blog_installed = "mezzanine.blog" in settings.INSTALLED_APPS
-# if blog_installed:
-#     BLOG_SLUG = settings.BLOG_SLUG.rstrip("/")
-#     if BLOG_SLUG:
-#         BLOG_SLUG += "/"
-#     blog_patterns = [
-#         url("^%s" % BLOG_SLUG, include("mezzanine.blog.urls")),
-#     ]
-#     urlpatterns += blog_patterns
+blog_installed = "mezzanine.blog" in settings.INSTALLED_APPS
+if blog_installed:
+    BLOG_SLUG = settings.BLOG_SLUG.rstrip("/")
+    if BLOG_SLUG:
+        BLOG_SLUG += "/"
+    blog_patterns = [
+        url("^%s" % BLOG_SLUG, include("mezzanine.blog.urls")),
+    ]
+    urlpatterns += blog_patterns
 
 # Mezzanine's Pages app.
 PAGES_SLUG = ""