Mercurial > personas_backend
changeset 66:f26d149da41c
Simplified some workflow; it's now assumed that all staff will use the admin interface, and only unprivileged users will use the standard persona form.
| author | Atul Varma <varmaa@toolness.com> |
|---|---|
| date | Tue, 11 Mar 2008 14:43:03 -0500 |
| parents | f54ea1612d1e |
| children | 029e3ad3cde0 |
| files | PersonasBackend/personas/forms.py PersonasBackend/personas/templates/personas/list.html PersonasBackend/personas/views.py |
| diffstat | 3 files changed, 8 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/PersonasBackend/personas/forms.py Tue Mar 11 14:27:11 2008 -0500 +++ b/PersonasBackend/personas/forms.py Tue Mar 11 14:43:03 2008 -0500 @@ -1,7 +1,7 @@ from django.newforms import ModelForm from PersonasBackend.personas import models -class StandardPersonaForm( ModelForm ): +class PersonaForm( ModelForm ): """ Form given to normal users who don't have the permission to publish Personas. @@ -10,13 +10,3 @@ class Meta: model = models.Persona exclude = ["owner", "status", "updater"] - -class PublisherPersonaForm( ModelForm ): - """ - Form given to admin/staff users who have the permission to publish - Personas. - """ - - class Meta: - model = models.Persona - exclude = ["owner", "updater"]
--- a/PersonasBackend/personas/templates/personas/list.html Tue Mar 11 14:27:11 2008 -0500 +++ b/PersonasBackend/personas/templates/personas/list.html Tue Mar 11 14:43:03 2008 -0500 @@ -7,13 +7,13 @@ <div class="addon-listitem clearfix-right corner-box"> <h2 class="addonname">{{ persona.name }}</h2> <div class="addon-desc">{{ persona.description }}</div> + {% if perms.personas.can_publish %} + <a href="{% url django.contrib.admin.views.main.change_stage "personas","persona",persona.id %}">Edit</a> + {% else %} {% ifequal persona.owner user %} <a href="{% url edit-persona persona.id %}">Edit</a> - {% else %} - {% if perms.personas.can_publish %} - <a href="{% url edit-persona persona.id %}">Edit</a> + {% endifequal %} {% endif %} - {% endifequal %} </div> {% endfor %} {% else %}
--- a/PersonasBackend/personas/views.py Tue Mar 11 14:27:11 2008 -0500 +++ b/PersonasBackend/personas/views.py Tue Mar 11 14:43:03 2008 -0500 @@ -80,16 +80,11 @@ ) pageTitle = "Edit Persona" - if request.user.has_perm( "personas.can_publish" ): - PersonaForm = forms.PublisherPersonaForm - else: - PersonaForm = forms.StandardPersonaForm - if request.method == "POST": for img_name in request.FILES: _rename_file( request.FILES[img_name], persona ) - form = PersonaForm( request.POST, request.FILES, - instance=persona ) + form = forms.PersonaForm( request.POST, request.FILES, + instance=persona ) if form.is_valid(): newPersona = form.save( commit=False ) newPersona.updater = request.user @@ -102,7 +97,7 @@ url = reverse("edit-persona", args=[newPersona.id]) return HttpResponseRedirect( url ) else: - form = PersonaForm( instance=persona ) + form = forms.PersonaForm( instance=persona ) return render_to_response( "personas/edit.html",