from dae import models as dae
from rh_v1 import models as rh
-PostePieceForm = inlineformset_factory(dae.Poste, dae.PostePiece)
-DossierPieceForm = inlineformset_factory(dae.Dossier, dae.DossierPiece)
+
+class PostePieceForm(inlineformset_factory(dae.Poste, dae.PostePiece)):
+ pass
+
+class DossierPieceForm(inlineformset_factory(dae.Dossier, dae.DossierPiece)):
+ pass
+
class PosteValidationForm(forms.ModelForm):
""" Validation d'un poste"""
from django.http import Http404, HttpResponse, HttpResponseGone
from django.shortcuts import redirect, render_to_response, get_object_or_404
from django.template import RequestContext
+from django.contrib import messages
from reversion.models import Version
data.update(dict(request.POST.items()))
form = PosteForm(data, instance=poste)
piecesForm = PostePieceForm(request.POST, request.FILES, instance=poste)
- if 'save' in data and form.is_valid():
+ if 'save' in data and form.is_valid() and piecesForm.is_valid():
poste = form.save()
piecesForm.instance = poste
piecesForm.save()
- request.user.message_set.create(message="Le poste %s a été sauvegardé." % poste)
+ messages.add_message(request, messages.SUCCESS, "Le poste %s a été sauvegardé." % poste)
return redirect('poste', key='dae-%s' % poste.id)
+ else:
+ messages.add_message(request, messages.ERROR, 'Il y a des erreurs dans le formulaire.')
+
else:
# 'initial' évite la validation prémature lors d'une copie de poste de
# rh_v1 vers dae.
dossier_form = DossierForm(request.POST, instance=dossier)
piecesForm = DossierPieceForm(request.POST, request.FILES, instance=dossier)
- if dossier_form.is_valid():
+ if dossier_form.is_valid() and piecesForm.is_valid():
dossier = dossier_form.save()
piecesForm.instance = dossier
piecesForm.save()
for k, v in cg_lines[r.id].items():
setattr(r, k, v)
r.save()
-
- request.user.message_set.create(message="Le dossier %s a été sauvegardé." % dossier)
+
+ messages.add_message(request, messages.SUCCESS, "Le dossier %s a été sauvegardé." % dossier)
return redirect('embauche', key='dae-%s' % poste.id,
dossier=dossier.id)
+ else:
+ messages.add_message(request, messages.ERROR, 'Il y a des erreurs dans le formulaire.')
+
else:
dossier_form = DossierForm(instance=dossier)
piecesForm = DossierPieceForm(instance=dossier)
#breadcrumb .separator {font-size: 120%;}
ul.messagelist {border: 1px solid #DDDDDD; padding-left:}
-ul.messagelist li {background: url("/media/django/img/admin/icon_success.gif") no-repeat scroll 32px 0.3em #FFFFCC; color: #666666; display: block; font-size: 12px; margin:0; padding: 4px 5px 4px 55px;}
+ul.messagelist li {color: #666666; display: block; font-size: 12px; margin:0; padding: 4px 5px 4px 55px;}
+ul.messagelist li.success {background: url("/media/django/img/admin/icon_success.gif") no-repeat scroll 32px 0.3em #FFFFCC;}
+ul.messagelist li.info {background: url("/media/django/img/admin/icon_success.gif") no-repeat scroll 32px 0.3em #FFFFCC;}
+ul.messagelist li.error {background: url("/media/django/img/admin/icon_error.gif") no-repeat scroll 32px 0.3em #FFFFCC;}
#main {padding:0% 2%; min-height:300px; }
MIDDLEWARE_CLASSES = (
'django.middleware.common.CommonMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
+ 'django.contrib.messages.middleware.MessageMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.middleware.doc.XViewMiddleware',
'reversion.middleware.RevisionMiddleware',
'admin_tools.dashboard',
'django.contrib.auth',
'django.contrib.contenttypes',
+ 'django.contrib.messages',
'django.contrib.sessions',
'django.contrib.admin',
'south',