savannah-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Savannah-cvs] [SCM] Savane-cleanup framework branch, master, updated. 4


From: Jonathan Gonzalez V.
Subject: [Savannah-cvs] [SCM] Savane-cleanup framework branch, master, updated. 4eea87fbd19bcafb9d559b18f2a91e4996ee2089
Date: Thu, 11 Jun 2009 13:42:11 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Savane-cleanup framework".

The branch, master has been updated
       via  4eea87fbd19bcafb9d559b18f2a91e4996ee2089 (commit)
      from  bf4ec0fe042c994410ea0e59f7981ca8e47cefa3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/savane-cleanup/framework.git/commit/?id=4eea87fbd19bcafb9d559b18f2a91e4996ee2089

commit 4eea87fbd19bcafb9d559b18f2a91e4996ee2089
Author: Jonathan Gonzalez V <address@hidden(none)>
Date:   Thu Jun 11 09:41:31 2009 -0400

    Some changes to test the new hook

diff --git a/savane/savane_user/views.py b/savane/savane_user/views.py
index 0c2f95d..b3e459f 100644
--- a/savane/savane_user/views.py
+++ b/savane/savane_user/views.py
@@ -47,18 +47,25 @@ def sv_identity( request ):
 def sv_authentication( request ):
     if request.user.is_authenticated() is False:
         return HttpResponseRedirect( '/' )
+
     error = ''
     if request.method == 'POST':
         form = PasswordForm( request.POST )
 
         if form.is_valid():
-            success = u"Valid Form"
-            form = PasswordForm( )
-            return render_to_response( 'savane_user/authentication.djhtml',
-                                       RequestContext( request,
-                                                       { 'form' : form,
-                                                         'success_message' : 
success,}
-                                                       ) )
+            if request.user.check_password( request.POST['old_password'] ):
+                form = PasswordForm( )
+                return render_to_response( 'savane_user/authentication.djhtml',
+                                           RequestContext( request,
+                                                           { 'form' : form,
+                                                             'success_message' 
: success,}
+                                                           ) )
+            else:
+                return render_to_response( 'savane_user/authentication.djhtml',
+                                           RequestContext( request,
+                                                           { 'form' : form,
+                                                             'error_message' : 
"Current password doesn't match",}
+                                                           ))
         else:
             error = u"Isn't valid"
     else:
@@ -70,8 +77,42 @@ def sv_authentication( request ):
                                                 'error_message' : error,}
                                                ) )
 
+
+
 class PasswordForm( forms.Form ):
     old_password = forms.CharField(widget=forms.PasswordInput,required=True)
     new_password = forms.CharField(widget=forms.PasswordInput,required=True)
     repated_password = 
forms.CharField(widget=forms.PasswordInput,required=True)
     accion = forms.CharField( widget=forms.HiddenInput, required=True, 
initial='update' )
+
+def sv_mail( request ):
+
+    if request.method == 'POST':
+        form = MailForm( request.POST )
+
+        if form.is_valid():
+            request.user.email = request.POST['email']
+            request.user.save()
+            return render_to_response( 'savane_user/mail.djhtml',
+                                       RequestContext( request,
+                                                       { 'form' : form,
+                                                         'success_message' : 
'The E-mail address was succesfully changed'
+                                                         }
+                                                       ) )
+        else:
+            return render_to_response( 'savane_user/mail.djhtml',
+                                       RequestContext( request,
+                                                       { 'form' : form,
+                                                         'error_message' : 
'Could not change the e-mail address'
+                                                         }
+                                                       ) )
+    else:
+        form = MailForm()
+
+    return render_to_response( 'savane_user/mail.djhtml',
+                               RequestContext( request,
+                                               { 'form' : form }
+                                               ) )
+
+class MailForm( forms.Form ):
+    email = forms.CharField(required=True)
diff --git a/template/savane_user/mail.djhtml b/template/savane_user/mail.djhtml
new file mode 100644
index 0000000..6771d70
--- /dev/null
+++ b/template/savane_user/mail.djhtml
@@ -0,0 +1,13 @@
+{% extends "base.djhtml" %}
+
+{% block content %}
+<div class="box">
+  <div class="boxtitle">Change E-Mail</div>
+  <div class="boxitem">
+    <form method="post">
+    {{form.as_p}}
+    <input type="submit" value="Update" />
+    </form>
+  </div>
+</div>
+{% endblock %}

-----------------------------------------------------------------------

Summary of changes:
 savane/savane_user/views.py      |   55 +++++++++++++++++++++++++++++++++-----
 template/savane_user/mail.djhtml |   13 +++++++++
 2 files changed, 61 insertions(+), 7 deletions(-)
 create mode 100644 template/savane_user/mail.djhtml


hooks/post-receive
-- 
Savane-cleanup framework




reply via email to

[Prev in Thread] Current Thread [Next in Thread]