From 838f1585f18722b3913b70363ca73a84305802f9 Mon Sep 17 00:00:00 2001
From: Lincoln de Sousa <lincoln@archlinux-br.org>
Date: Thu, 27 Sep 2007 09:44:06 -0300
Subject: [PATCH] =?utf8?q?ajeitando=20a=20edi=C3=A7=C3=A3o=20de=20dados=20?=
 =?utf8?q?tanto=20de=20palestrante=20quanto=20de=20participante.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 eventos/models.py                             |  2 +-
 templates/base.html                           |  3 ++-
 ...r_palestrante.html => editar_usuario.html} |  2 +-
 views.py                                      | 23 +++++++++++++------
 4 files changed, 20 insertions(+), 10 deletions(-)
 rename templates/{editar_palestrante.html => editar_usuario.html} (91%)

diff --git a/eventos/models.py b/eventos/models.py
index d770b1f..825f3da 100644
--- a/eventos/models.py
+++ b/eventos/models.py
@@ -100,7 +100,7 @@ class Participante(models.Model):
 
     comercial = models.BooleanField(default=False)
     usuario = models.ForeignKey(User)
-    refbanco = models.IntegerField()
+    refbanco = models.IntegerField(editable=False)
 
     class Admin:
         pass
diff --git a/templates/base.html b/templates/base.html
index 88f9392..57fc567 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -15,10 +15,11 @@
 
             <form id="menu-palestrante">
                 <ul>
+                    <li><a href="/meus_dados">Editar dados de usuário</a></li>
+
                     {% if user.palestrante_set.all %}
                     <li><a href="/submeter_trabalho">Submeter Trabalho</a></li>
                     <li><a href="/meus_trabalhos">Trabalhos inscritos</a></li>
-                    <li><a href="/meus_dados">Editar dados de usuário</a></li>
                     {% else %}
 
                         {% if user.participante_set.all %}
diff --git a/templates/editar_palestrante.html b/templates/editar_usuario.html
similarity index 91%
rename from templates/editar_palestrante.html
rename to templates/editar_usuario.html
index b92c0ec..d42402c 100644
--- a/templates/editar_palestrante.html
+++ b/templates/editar_usuario.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% block content %}
 
-<h2>Editar Palestrante</h2>
+<h2>Editar {{ title }}</h2>
 
 {% if ok %}
 
diff --git a/views.py b/views.py
index e64e704..245b0bd 100644
--- a/views.py
+++ b/views.py
@@ -354,22 +354,31 @@ def editar_trabalho(request, codigo):
 
 @login_required
 def meus_dados(request):
-    form = EditarPalestrante(request.POST or None)
-    palestrante = request.user.palestrante_set.get()
+    try:
+        entity = request.user.palestrante_set.get()
+    except Palestrante.DoesNotExist:
+        entity = request.user.participante_set.get()
+
+    FormKlass = form_for_instance(entity)
+
+    # ugly hammer to hide some fields...
+    del FormKlass.base_fields['usuario']
+
+    form = FormKlass(request.POST or None)
     ok = False
 
     for name, field in form.fields.items():
-        field.initial = getattr(palestrante, name)
+        field.initial = getattr(entity, name)
 
     if request.POST and form.is_valid():
         cd = form.cleaned_data
         for name, field in form.fields.items():
-            setattr(palestrante, name, cd[name])
-        palestrante.save()
+            setattr(entity, name, cd[name])
+        entity.save()
         ok = True
 
-    c = {'form': form, 'ok': ok}
-    return build_response(request, 'editar_palestrante.html', c)
+    c = {'form': form, 'ok': ok, 'title': entity.__class__.__name__}
+    return build_response(request, 'editar_usuario.html', c)
 
 
 @enable_login_form
-- 
2.20.1