From: Charles Connell <charles@connells.org>
Date: Thu, 13 Mar 2014 02:57:48 +0000 (-0400)
Subject: Simpler keyword URL
X-Git-Tag: release-20150131~148^2^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=refs%2Fpull%2F357%2Fhead;p=oweals%2Fkarmaworld.git

Simpler keyword URL
---

diff --git a/karmaworld/templates/quizzes/keyword_edit.html b/karmaworld/templates/quizzes/keyword_edit.html
index 52b3d43..00adcd8 100644
--- a/karmaworld/templates/quizzes/keyword_edit.html
+++ b/karmaworld/templates/quizzes/keyword_edit.html
@@ -44,7 +44,7 @@
     <div id="activity_container">
       <div class="row">
         <div class="small-12 columns">
-          <form id="keyword-form" action="{% url 'keyword_edit' note.course.school.slug note.course.slug note.slug %}" method="post">
+          <form id="keyword-form" action="{% url 'keyword_edit' note.slug %}" method="post">
             {% csrf_token %}
             {{ form.management_form }}
             <div class="hide" id="keyword-form-prototype">
diff --git a/karmaworld/urls.py b/karmaworld/urls.py
index 677e4a7..00a83a2 100644
--- a/karmaworld/urls.py
+++ b/karmaworld/urls.py
@@ -121,7 +121,7 @@ urlpatterns = patterns('',
     # Quizzes
     url(r'^quiz/(?P<pk>[\d]+)/$',
         QuizView.as_view(), name='quiz'),
-    url(r'^note/' + SLUG.format('school_') + '/' + SLUG.format('course_') +'/'+ SLUG.format('') +'/keywords/$',
+    url(r'^keywords/' + SLUG.format('') + '/$',
         KeywordEditView.as_view(), name='keyword_edit'),
 
     url(r'^$', CourseListView.as_view(model=Course), name='home'),