enables entering user details including website url and bio

fixes usage of objects. still need to display the data on user page

diff --git a/mediagoblin/edit/routing.py b/mediagoblin/edit/routing.py
index 37595f05d4801b82f867453e7bec0e17333b7d90..9604d214740f0a0919079ee7c96d1dc97198e31d 100644 (file)
--- a/mediagoblin/edit/routing.py
+++ b/mediagoblin/edit/routing.py
@@ -20,5 +20,4 @@ from routes.route import Route
 edit_routes = [
     # Media editing view handled in user_pages/routing.py
     Route('mediagoblin.edit.profile', '/{user}/profile/',
-        controller="mediagoblin.edit.views:edit_profile")
-]
+        controller="mediagoblin.edit.views:edit_profile")]

diff --git a/mediagoblin/edit/views.py b/mediagoblin/edit/views.py
index cb62d2fa31adbba6033f24a03a85e5f82f1a2005..57c9a1181cc768431092903cbdadf0b66435cbc8 100644 (file)
--- a/mediagoblin/edit/views.py
+++ b/mediagoblin/edit/views.py
@@ -63,16 +63,17 @@ def edit_media(request, media):
 @require_active_login
 def edit_profile(request):
 
+    user = request.user
     form = forms.EditProfileForm(request.POST,
-        url = user['url'],
-        bio = user['bio'])
+        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 redirect(request, "index", user=user['username'])
 
     return render_to_response(
         request,

diff --git a/mediagoblin/templates/mediagoblin/edit/edit_profile.html b/mediagoblin/templates/mediagoblin/edit/edit_profile.html
index 9f6667fdda65161c420c9345ac5300537dff117d..63bf013f8ac9f4631f61d25470627c65e8953d5e 100644 (file)
--- a/mediagoblin/templates/mediagoblin/edit/edit_profile.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit_profile.html
@@ -20,7 +20,7 @@
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 
 {% block mediagoblin_content %}
-  <h1>Edit details for {{ user }}</h1>
+  <h1>Edit details for {{ user['username'] }}</h1>
 
   <form action="{{ request.urlgen('mediagoblin.edit.profile',
                                user=user.username) }}"

diff --git a/mediagoblin/templates/mediagoblin/root.html b/mediagoblin/templates/mediagoblin/root.html
index 7af572b01a7d3e17f326b87c51b0325ff95f77b8..697ac15bdc9f2700ec64be5053fb4923179fc50b 100644 (file)
--- a/mediagoblin/templates/mediagoblin/root.html
+++ b/mediagoblin/templates/mediagoblin/root.html
@@ -24,7 +24,9 @@
   {% if request.user %}
   <p>
     <a href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit an item</a> 
-    <a href="{{ request.urlgen('mediagoblin.edit.profile') }}">Edit profile</a>
+    <a href="{{ request.urlgen(
+            'mediagoblin.edit.profile', 
+            user=request.user.username) }}">Edit profile</a>
   </p>
 
   {% else %}