mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-22 11:23:10 +00:00
Merge branch 'fix_optionaluser' into 'master'
Fix preferences/edit_options/OptionalUser See merge request federez/re2o!59
This commit is contained in:
commit
99c69a5d37
1 changed files with 28 additions and 29 deletions
|
@ -79,42 +79,41 @@ def display_options(request):
|
||||||
|
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
@permission_required('admin')
|
|
||||||
def edit_options(request, section):
|
def edit_options(request, section):
|
||||||
""" Edition des préférences générales"""
|
""" Edition des préférences générales"""
|
||||||
model = getattr(models, section, None)
|
model = getattr(models, section, None)
|
||||||
form_instance = getattr(forms, 'Edit' + section + 'Form', None)
|
form_instance = getattr(forms, 'Edit' + section + 'Form', None)
|
||||||
if model and form:
|
if not (model or form_instance):
|
||||||
options_instance, _created = model.objects.get_or_create()
|
|
||||||
can, msg = options_instance.can_edit(request.user)
|
|
||||||
if not can:
|
|
||||||
messages.error(request, msg or "Vous ne pouvez pas éditer cette\
|
|
||||||
option.")
|
|
||||||
return redirect(reverse('index'))
|
|
||||||
options = form_instance(
|
|
||||||
request.POST or None,
|
|
||||||
instance=options_instance
|
|
||||||
)
|
|
||||||
if options.is_valid():
|
|
||||||
with transaction.atomic(), reversion.create_revision():
|
|
||||||
options.save()
|
|
||||||
reversion.set_user(request.user)
|
|
||||||
reversion.set_comment(
|
|
||||||
"Champs modifié(s) : %s" % ', '.join(
|
|
||||||
field for field in options.changed_data
|
|
||||||
)
|
|
||||||
)
|
|
||||||
messages.success(request, "Préférences modifiées")
|
|
||||||
return redirect(reverse('preferences:display-options'))
|
|
||||||
return form(
|
|
||||||
{'options': options},
|
|
||||||
'preferences/edit_preferences.html',
|
|
||||||
request
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
messages.error(request, "Objet inconnu")
|
messages.error(request, "Objet inconnu")
|
||||||
return redirect(reverse('preferences:display-options'))
|
return redirect(reverse('preferences:display-options'))
|
||||||
|
|
||||||
|
options_instance, _created = model.objects.get_or_create()
|
||||||
|
can, msg = options_instance.can_edit(request.user)
|
||||||
|
if not can:
|
||||||
|
messages.error(request, msg or "Vous ne pouvez pas éditer cette\
|
||||||
|
option.")
|
||||||
|
return redirect(reverse('index'))
|
||||||
|
options = form_instance(
|
||||||
|
request.POST or None,
|
||||||
|
instance=options_instance
|
||||||
|
)
|
||||||
|
if options.is_valid():
|
||||||
|
with transaction.atomic(), reversion.create_revision():
|
||||||
|
options.save()
|
||||||
|
reversion.set_user(request.user)
|
||||||
|
reversion.set_comment(
|
||||||
|
"Champs modifié(s) : %s" % ', '.join(
|
||||||
|
field for field in options.changed_data
|
||||||
|
)
|
||||||
|
)
|
||||||
|
messages.success(request, "Préférences modifiées")
|
||||||
|
return redirect(reverse('preferences:display-options'))
|
||||||
|
return form(
|
||||||
|
{'options': options},
|
||||||
|
'preferences/edit_preferences.html',
|
||||||
|
request
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
@can_create(Service)
|
@can_create(Service)
|
||||||
|
|
Loading…
Reference in a new issue