From 8a020a36b50c1e25f956764cae3fdc54e01724f4 Mon Sep 17 00:00:00 2001 From: tkroenert Date: Fri, 20 Jan 2012 20:08:43 +0100 Subject: [PATCH] Virtual Transaction: no more transaction to yourself --- k4ever/transaction/forms.py | 3 ++- k4ever/transaction/models.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/k4ever/transaction/forms.py b/k4ever/transaction/forms.py index 1b86444..b73a75c 100644 --- a/k4ever/transaction/forms.py +++ b/k4ever/transaction/forms.py @@ -25,7 +25,6 @@ class TransactionForm(forms.ModelForm): class VirtualTransactionForm(forms.ModelForm): """ ModelForm for :class:`Virtual Transactions ` with a currency field. """ - recipient = forms.CharField(max_length=100) amount = CurrencyField(label='Betrag') class Meta: @@ -37,4 +36,6 @@ class VirtualTransactionForm(forms.ModelForm): user = User.objects.get(username=self.cleaned_data['recipient']) except User.DoesNotExist: raise ValidationError(u"Emfpänger '%s' konnte nicht gefunden werden" % self.cleaned_data['recipient']) + if user == self.instance.user: + raise ValidationError(u"Emfpänger '%s' bist du selbst" % self.cleaned_data['recipient']) return user diff --git a/k4ever/transaction/models.py b/k4ever/transaction/models.py index d0c86de..3be7cd1 100644 --- a/k4ever/transaction/models.py +++ b/k4ever/transaction/models.py @@ -70,7 +70,8 @@ class VirtualTransaction(models.Model): @staticmethod def moveMoney(fromUser, toUser, amount, commit=True): - if fromUser != toUser: + print fromUser, toUser, fromUser == toUser, fromUser.id, toUser.id + if not (fromUser == toUser): fromProfile = fromUser.get_profile() toProfile = toUser.get_profile() fromProfile.balance -= amount