Fix media.urls, pin bleach==1.5.0

diff --git a/app/organization/media/urls.py b/app/organization/media/urls.py
index d0d65e21545a514419412647baab126416342544..0cc5df193ae3905443f7dce4c0e1fa7e95d4dbe2 100644 (file)
--- a/app/organization/media/urls.py
+++ b/app/organization/media/urls.py
@@ -33,11 +33,11 @@ from organization.media.views import *
 
 
 urlpatterns = [
-    url("^playlist/overlay/(?P<slug>.*)/$", PlaylistOverlayView.as_view(), name="organization-playlist-overlay"),
-    url("^media/(?P<type>.*)/detail/(?P<slug>.*)/$", MediaDetailView.as_view(), name="organization-media-detail"),
-    url("^media/(?P<type>.*)/overlay/(?P<slug>.*)/$", MediaOverlayView.as_view(), name="organization-media-overlay"),
-    url("^playlist/detail/(?P<slug>.*)/$", PlaylistDetailView.as_view(), name="organization-playlist-detail"),
-    url("^playlist/list/$", PlaylistListView.as_view(), name="organization-playlist-list"),
-    url("^playlist/list/(?P<type>.*)$", PlaylistListView.as_view(), name="organization-playlist-list"),
+    url("^medias/(?P<type>.*)/(?P<slug>.*)/detail/$", MediaDetailView.as_view(), name="organization-media-detail"),
+    url("^medias/(?P<type>.*)/(?P<slug>.*)/overlay/$", MediaOverlayView.as_view(), name="organization-media-overlay"),
+    url("^playlists/(?P<slug>.*)/detail/$", PlaylistDetailView.as_view(), name="organization-playlist-detail"),
+    url("^playlists/list/$", PlaylistListView.as_view(), name="organization-playlist-list"),
+    url("^playlists/list/(?P<type>.*)$", PlaylistListView.as_view(), name="organization-playlist-list"),
+    url("^playlists/overlay/(?P<slug>.*)/$", PlaylistOverlayView.as_view(), name="organization-playlist-overlay"),
     url("^playlist-media-autocomplete/$",  permission_required('playlist.can_edit')(PlayListMediaView.as_view()), name='media-autocomplete'),
 ]

diff --git a/app/organization/projects/urls.py b/app/organization/projects/urls.py
index e9c91a3605d091354b2362d1b51d2c8d9eeaf5b3..81c8fd8e2f591b4b99375821ba5293c133f795ef 100644 (file)
--- a/app/organization/projects/urls.py
+++ b/app/organization/projects/urls.py
@@ -33,7 +33,7 @@ from organization.projects.views import *
 urlpatterns = [
     url("^dynamic-content-project/$",  permission_required('project.can_edit')(DynamicContentProjectView.as_view()), name='dynamic-content-project'),
 
-    url("^project/detail/(?P<slug>.*)/$", ProjectDetailView.as_view(), name='organization-project-detail'),
+    url("^projects/detail/(?P<slug>.*)/$", ProjectDetailView.as_view(), name='organization-project-detail'),
     url("^projects/demo/(?P<slug>.*)/$", ProjectDemoDetailView.as_view(), name='organization-project-demo-detail'),
     url("^projects/blog/(?P<slug>.*)/$", ProjectBlogPageView.as_view(), name='organization-project-blogpage-detail'),
 

diff --git a/requirements.txt b/requirements.txt
index 24cd63356bd499996872cbc65d9ce2a30ed7a803..406c47778104363d5a1e7f1614cdaeb481bdc2f8 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -27,3 +27,4 @@ DateTimeRange==0.2.8
 workalendar==1.0.0
 django-instagram==0.2.0a1
 django-extra-views==0.8.0
+bleach==1.5.0