Merge remote-tracking branch 'gitorious/master'

1 files changed, 22 insertions, 0 deletions

diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index 6c16a61e..a9071495 100644
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -68,3 +68,25 @@ def edit_media(request, media):
         'mediagoblin/edit/edit.html',
         {'media': media,
          'form': form})
+    
+
+@require_active_login
+def edit_profile(request):
+
+    user = request.user
+    form = forms.EditProfileForm(request.POST,
+        url = user.get('url'),
+        bio = user.get('bio'))
+
+    if request.method == 'POST' and form.validate():
+            user['url'] = request.POST['url']
+            user['bio'] = request.POST['bio']
+            user.save()
+
+            return redirect(request, "index", user=user['username'])
+
+    return render_to_response(
+        request,
+        'mediagoblin/edit/edit_profile.html',
+        {'user': user,
+         'form': form})