From 6721143fe36778f75889b16db771b35f63f9854a Mon Sep 17 00:00:00 2001
From: saksham1115 <saksham115@gmail.com>
Date: Sun, 26 Jun 2016 12:15:47 +0000
Subject: Cleaning up

---
 mediagoblin/edit/routing.py |  4 ++--
 mediagoblin/edit/views.py   | 30 ++----------------------------
 2 files changed, 4 insertions(+), 30 deletions(-)

(limited to 'mediagoblin/edit')

diff --git a/mediagoblin/edit/routing.py b/mediagoblin/edit/routing.py
index d6d07dae..ec776bd9 100644
--- a/mediagoblin/edit/routing.py
+++ b/mediagoblin/edit/routing.py
@@ -30,5 +30,5 @@ add_route('mediagoblin.edit.email', '/edit/email/',
     'mediagoblin.edit.views:change_email')
 add_route('mediagoblin.edit.deauthorize_applications', '/edit/deauthorize/',
     'mediagoblin.edit.views:deauthorize_applications')
-add_route('mediagoblin.edit.edit_subtitles', '/c_s/<string:path>/edit/',
-    'mediagoblin.edit.views:edit_subtitles')
+add_route('mediagoblin.edit.custom_subtitles', '/c_s/<string:path>/edit/',
+    'mediagoblin.edit.views:custom_subtitles')
diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index 0582b08c..6d3e684b 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -579,39 +579,13 @@ def edit_metadata(request, media):
         {'form':form,
          'media':media})
 
-@require_active_login
-@path_subtitle
-def custom_subtitles(request,path=None):
-    path = path.encode('ascii','ignore')[1:-1].split(',')
-    for index in range(0,len(path)):
-        path[index] = path[index].encode('utf8')
-        path[index] = path[index].strip()
-        path[index] = path[index][2:-1]
-    temp = path[0]
-    for index in range(1,len(path)):
-        temp = temp + "/" + path[index]
-    path = "/mgoblin_media/" + temp #Bug, have to solve this
-    return render_to_response(
-        request,
-        "mediagoblin/user_pages/custom_subtitles.html",
-        {"path": path}
-        )
 
 @require_active_login
 @path_subtitle
-def edit_subtitles(request,path=None):
-    path = path.encode('ascii','ignore')[1:-1].split(',')
-    for index in range(0,len(path)):
-        path[index] = path[index].encode('utf8')
-        path[index] = path[index].strip()
-        path[index] = path[index][2:-1]
-    temp = path[0]
-    for index in range(1,len(path)):
-        temp = temp + "/" + path[index]
-    path = "/mgoblin_media/" + temp #Bug, have to solve this
+def custom_subtitles(request,path=None):
     form = forms.CustomizeSubtitlesForm(request.form)
     return render_to_response(
         request,
-        "mediagoblin/edit/edit_subtitles.html",
+        "mediagoblin/edit/custom_subtitles.html",
         {"path": path,
          "form": form })
\ No newline at end of file
-- 
cgit v1.2.3