Merge branch 'master' of git.assembla.com:lp-cdw.4

localprojects · Dec 7, 2013 · 3228efb · 3228efb
2 parents e7431d6 + 9cbbdef
commit 3228efb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/cdw/templates/profile_edit.html b/cdw/templates/profile_edit.html
@@ -18,7 +18,7 @@ <h4 style="text-align:right; margin:0 20px;"><a href="/profile">Back to Profile<
           </div>
           <div class="panel-content">
             <form action="/profile/edit" method="POST">
-              {{ form.csrf }}
+              {{ form.csrf_token }}
               <div class="form-item span-18 append-10">
                 <p>{{ form.username.label }}</p>
                 {% if form.username.errors %}
@@ -62,7 +62,7 @@ <h4 style="text-align:right; margin:0 20px;"><a href="/profile">Back to Profile<
             <p class='verify-msg'></p>
             <div class="verify-phone">
               <form action="/verify/phone" method="POST" class="phone">
-                {{ phoneForm.csrf }}
+                {{ phoneForm.csrf_token }}
                 {{ phoneForm.phonenumber }}
                 <div class="form-item span-30">
                   <div class="span-14">

diff --git a/cdw/templates/register.html b/cdw/templates/register.html
@@ -11,7 +11,7 @@
     <div class="prepend-2 span-43 append-2 register-view">
       <h3 class="sub-title">Create an Account</h3>
       <form action="/register" method="POST" class="register">
-        {{ form.csrf }}
+        {{ form.csrf_token }}
         <p>
           {{ form.username.label }}
         </p>
@@ -68,7 +68,7 @@ <h3 class="sub-title">Create an Account</h3>
         <p class='verify-msg'></p>
         <div class="verify-phone">
           <form action="/verify/phone" method="POST" class="phone">
-            {{ phoneForm.csrf }}
+            {{ phoneForm.csrf_token }}
             {{ phoneForm.phonenumber }}
             <div class="form-item span-30">
               <p>

diff --git a/cdw/templates/suggest.html b/cdw/templates/suggest.html
@@ -15,7 +15,7 @@
       <h3 class="sub-title">Suggest A Question</h3>
       <h4>Please phrase a question as having a <span style="color:#67b6fd;font-weight:700;">YES</span> or <span style="color:#e0681c;font-weight:700;">NO</span> answer.</h4>
       <form action="/suggest" method="POST">
-        {{ form.csrf }}
+        {{ form.csrf_token }}
         <textarea class="question-input" name="question">Enter your question here...</textarea>
         <h3 style="font-weight:700;">Tag your question with a category</h3>
         <div class="span-43">

diff --git a/etc/config.py.tmpl b/etc/config.py.tmpl
@@ -115,7 +115,9 @@ AUTH = {
   'user_service_name': 'cdw',
   'password_encryptor': '%(app_auth_password_encryptor)s',
   'salt': '%(app_auth_salt)s',
-  'post_connect_view': 'mobile#profile?new=true'
+  'post_connect_view': 'mobile#profile?new=true',
+  # Due to a coding inconsistency we need both connect_view and login_view
+  'post_login_view': 'mobile#profile?new=true'
 }
 
 # Social