diff options
| -rw-r--r-- | ishtar/furnitures/admin.py | 11 | ||||
| -rw-r--r-- | ishtar/furnitures/models.py | 4 |
2 files changed, 3 insertions, 12 deletions
diff --git a/ishtar/furnitures/admin.py b/ishtar/furnitures/admin.py index d4a4d5742..1a0b7d867 100644 --- a/ishtar/furnitures/admin.py +++ b/ishtar/furnitures/admin.py @@ -25,22 +25,13 @@ from django import forms from django.contrib import admin from django.core.exceptions import ObjectDoesNotExist from django.utils.translation import ugettext_lazy as _ -from django.contrib import messages from ishtar import settings import models class HistorizedObjectAdmin(admin.ModelAdmin): def save_model(self, request, obj, form, change): - try: - ishtar_user = models.IshtarUser.objects.get(user=request.user) - obj.history_modifier = ishtar_user - except ObjectDoesNotExist: - msg = _(u'Account \ -information not created. Create an Ishtar User associated to your account \ -before editing.') - messages.error(request, msg, fail_silently=True) - form.cleaned_data = {} + obj.history_modifier = request.user obj.save() class DepartementAdmin(admin.ModelAdmin): diff --git a/ishtar/furnitures/models.py b/ishtar/furnitures/models.py index 1dcb920c3..fa504ba59 100644 --- a/ishtar/furnitures/models.py +++ b/ishtar/furnitures/models.py @@ -25,7 +25,7 @@ import datetime from django.core.exceptions import ObjectDoesNotExist from django.utils.translation import ugettext_lazy as _ -from django.contrib.auth.models import User, UserManager +from django.contrib.auth.models import User from django.contrib.gis.db import models from django.contrib import admin @@ -48,7 +48,7 @@ class GeneralType(models.Model): return self.label class BaseHistorizedItem(models.Model): - history_modifier = models.ForeignKey("IshtarUser", related_name='+', + history_modifier = models.ForeignKey(User, related_name='+', verbose_name=_(u"Last modifier")) def save(self, *args, **kwargs): try: |