Merge pull request #1013 from DemocracyLab/approve_volunteer_#718

Approve volunteer #718

Author: marlonkeating

civictechprojects/views.py

@@ -899,7 +899,6 @@ def accept_project_volunteer(request, application_id):
     # Redirect to login if not logged in
     if not request.user.is_authenticated:
         return redirect(section_url(FrontEndSection.LogIn, {'prev': request.get_full_path()}))
-
     volunteer_relation = VolunteerRelation.objects.get(id=application_id)
     about_project_url = section_url(FrontEndSection.AboutProject, {'id': str(volunteer_relation.project.id)})
     if volunteer_relation.is_approved:

common/helpers/front_end.py

@@ -43,7 +43,12 @@ def section_path(section, args_dict=None):
     section_path_url = _section_path_special_cases(section_string, args_dict)
     if section_path_url:
         return section_path_url
-    section_path_url = '/' + url_generators[section_string]['generator'].format(**id_arg)
+    #check if it is a page section
+    is_page_section = has_page_section(section_string)
+    if(is_page_section):
+        section_path_url = '/' + url_generators[section_string]['generator'].format(**id_arg)
+    else:
+        section_path_url = section
     section_path_url += args_dict_to_query_string(args_dict)
     return section_path_url
 
@@ -62,6 +67,9 @@ def get_page_section(url):
     url_generator = get_page_section_generator(url)
     return url_generator and url_generator['section']
 
+def has_page_section(section_name):
+    from common.urls import url_generators
+    return section_name in url_generators
 
 def get_page_path_parameters(url, page_section_generator=None):
     page_section_generator = page_section_generator or get_page_section_generator(url)

democracylab/views.py

@@ -9,7 +9,6 @@
 from django.http import HttpResponse, JsonResponse
 from django.views.decorators.csrf import csrf_exempt
 import simplejson as json
-import ast
 from .emails import send_verification_email, send_password_reset_email
 from .forms import DemocracyLabUserCreationForm, DemocracyLabUserAddDetailsForm
 from .models import Contributor, get_request_contributor, get_contributor_by_username
@@ -20,7 +19,6 @@
 
 def login_view(request, provider=None):
     provider_ids = [p.id for p in registry.get_list()]
-
     if request.method == 'POST':
         email = request.POST['username']
         password = request.POST['password']
@@ -32,7 +30,7 @@ def login_view(request, provider=None):
         if user is not None and user.is_authenticated:
             login(request, user)
             prev_page_args = json.loads(prev_page_args_string) if prev_page_args_string else None
-            redirect_url = '/' if prev_page.strip('/') == '' else section_url(prev_page, prev_page_args)
+            redirect_url = '/' if prev_page.strip('/') == '' else section_url(prev_page,prev_page_args)
             return redirect(redirect_url)
         else:
             messages.error(request, 'Incorrect Email or Password')