Browse Source

Added DigitField

master
Niklas Brachmann 11 years ago
parent
commit
64e9a6be73
  1. 8
      cash/admin.py
  2. 13
      cash/formfields.py
  3. 28
      cash/locale/de/LC_MESSAGES/django.po

8
cash/admin.py

@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
from django.contrib import admin
from cash.models import *
from cash.formfields import DigitField
from django import forms
from django.template.defaultfilters import escape
from django.core.urlresolvers import reverse
@ -15,7 +16,9 @@ class AccountForm(forms.ModelForm): @@ -15,7 +16,9 @@ class AccountForm(forms.ModelForm):
credit_change_comment = forms.CharField(max_length=64, required=False,
label=ugettext_lazy('comment'))
pin_change = forms.RegexField(regex='^\d{4,}$', required=False,
#pin_change = forms.RegexField(regex='^\d{4,}$', required=False,
# label=ugettext_lazy('PIN'))
pin_change = DigitField(min_length=4, required=False,
label=ugettext_lazy('PIN'))
pin_empty = forms.BooleanField(required=False,
@ -78,6 +81,9 @@ class AccountAdmin(admin.ModelAdmin): @@ -78,6 +81,9 @@ class AccountAdmin(admin.ModelAdmin):
desc += ' (%s)' % (comment)
obj.change_credit(amount, subject, desc)
# Make sure the object is saved in any case
obj.save()
class ProductBarcodeInline(admin.TabularInline):
model = ProductBarcode

13
cash/formfields.py

@ -0,0 +1,13 @@ @@ -0,0 +1,13 @@
from django.forms import CharField
from django.core.exceptions import ValidationError
from django.utils.translation import ugettext_lazy as _
from django.core.validators import EMPTY_VALUES
class DigitField(CharField):
def clean(self, value):
super(DigitField, self).clean(value)
if value not in EMPTY_VALUES and not value.isdigit():
raise ValidationError(_('Please enter only digits.'))
return value

28
cash/locale/de/LC_MESSAGES/django.po

@ -8,7 +8,7 @@ msgid "" @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-09-18 00:00+0200\n"
"POT-Creation-Date: 2013-09-19 20:44+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -18,51 +18,55 @@ msgstr "" @@ -18,51 +18,55 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
#: admin.py:13 models.py:138 management/commands/dailydigest.py:40
#: admin.py:14 models.py:138 management/commands/dailydigest.py:40
msgid "amount"
msgstr "Betrag"
#: admin.py:16 models.py:92 models.py:121
#: admin.py:17 models.py:92 models.py:121
msgid "comment"
msgstr "Kommentar"
#: admin.py:19 models.py:14 views.py:81
#: admin.py:22 models.py:14 views.py:81
msgid "PIN"
msgstr "PIN"
#: admin.py:22
#: admin.py:25
msgid "clear PIN"
msgstr "PIN löschen"
#: admin.py:35
#: admin.py:38
msgid "credit change"
msgstr "Ein-/Auszahlung"
#: admin.py:38
#: admin.py:41
msgid "change PIN"
msgstr "PIN ändern"
#: admin.py:46
#: admin.py:49
msgid "Transactions"
msgstr "Transaktionen"
#: admin.py:48
#: admin.py:51
msgid "Transaction link"
msgstr "Transaktionslink"
#: admin.py:62
#: admin.py:65
msgid "Payout"
msgstr "Auszahlung"
#: admin.py:63
#: admin.py:66
msgid "Deposit"
msgstr "Einzahlung"
#: admin.py:64
#: admin.py:67
#, python-format
msgid "Authorized by %(first)s %(last)s"
msgstr "Autorisiert von %(first)s %(last)s"
#: formfields.py:10
msgid "Please enter only digits."
msgstr "Bitte nur Ziffern eingeben."
#: models.py:13
msgid "card number"
msgstr "Kartennummer"

Loading…
Cancel
Save