From c8500d0c00ea11ee47b78d616cb8773ad2121967 Mon Sep 17 00:00:00 2001 From: Magnus Hagander Date: Tue, 27 Jan 2009 14:48:32 +0100 Subject: [PATCH] Show a "form saved at" message when save is clicked, to make it clear something happened. Per Heikki. --- gitadmin/adm/templates/repoview.html | 3 +++ gitadmin/adm/views.py | 18 ++++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/gitadmin/adm/templates/repoview.html b/gitadmin/adm/templates/repoview.html index f6af412..02753e0 100644 --- a/gitadmin/adm/templates/repoview.html +++ b/gitadmin/adm/templates/repoview.html @@ -7,6 +7,9 @@ You can still update the description and set permissions - they will all start working automatically when the repository is approved.

{%endif%} +{% if form_saved_at %} +

Your changes were successfully saved at {{form_saved_at|date:"Y-m-d H:i:s"}}.

+{%endif%}
{{form}} diff --git a/gitadmin/adm/views.py b/gitadmin/adm/views.py index effc67c..c7226b2 100644 --- a/gitadmin/adm/views.py +++ b/gitadmin/adm/views.py @@ -7,6 +7,8 @@ from django.contrib.auth.decorators import login_required, user_passes_test from django.forms.models import inlineformset_factory from django.db import transaction +import datetime + from gitadmin.adm.models import * from gitadmin.adm.forms import * @@ -51,6 +53,7 @@ def index(request): def editrepo(request, repoid): repo = get_object_or_404(Repository, repoid=repoid) repo.ValidateOwnerPermissions(request.user) + savedat = None formfactory = inlineformset_factory(Repository, RepositoryPermission, extra=1) @@ -63,12 +66,14 @@ def editrepo(request, repoid): if form.is_valid() and formset.is_valid(): form.save() formset.save() - return HttpResponseRedirect('.') - else: - form = RepositoryForm(instance=repo) - if not request.user.is_superuser: - del form.fields['approved'] - formset = formfactory(instance=repo) + savedat = datetime.datetime.now() + # Get a new copy of the repository to make sure it refreshes! + repo = get_object_or_404(Repository, repoid=repoid) + + form = RepositoryForm(instance=repo) + if not request.user.is_superuser: + del form.fields['approved'] + formset = formfactory(instance=repo) perm = repo.repositorypermission_set.all() @@ -77,6 +82,7 @@ def editrepo(request, repoid): 'formset': formset, 'repo': repo, 'repoperm': perm, + 'form_saved_at': savedat, },context_instance=RequestContext(request)) -- 2.39.5