diff --git a/apps/member/views.py b/apps/member/views.py index 88bd2678..21c8de5f 100644 --- a/apps/member/views.py +++ b/apps/member/views.py @@ -49,10 +49,10 @@ class UserCreateView(CreateView): def form_valid(self, form): profile_form = ProfileForm(self.request.POST) if form.is_valid() and profile_form.is_valid(): - user = form.save() - profile = profile_form.save(commit=False) - profile.user = user - profile.save() + user = form.save(commit=False) + user.profile = profile_form.save(commit=False) + user.save() + user.profile.save() return super().form_valid(form) diff --git a/apps/note/tables.py b/apps/note/tables.py index 9a2dce45..e85fcbae 100644 --- a/apps/note/tables.py +++ b/apps/note/tables.py @@ -6,7 +6,8 @@ from django.db.models import F from django_tables2.utils import A from .models.notes import Alias -from .models.transactions import Transaction +from .models.transactions import Transaction, TransactionTemplate +from .templatetags.pretty_money import pretty_money class HistoryTable(tables.Table): @@ -16,6 +17,7 @@ class HistoryTable(tables.Table): 'table table-condensed table-striped table-hover' } model = Transaction + exclude = ("polymorphic_ctype", ) template_name = 'django_tables2/bootstrap4.html' sequence = ('...', 'total', 'valid') @@ -27,6 +29,12 @@ class HistoryTable(tables.Table): .order_by(('-' if is_descending else '') + 'total') return (queryset, True) + def render_amount(self, value): + return pretty_money(value) + + def render_total(self, value): + return pretty_money(value) + class AliasTable(tables.Table): class Meta: diff --git a/note_kfet/fixtures/cas.json b/note_kfet/fixtures/cas.json new file mode 100644 index 00000000..c3109d19 --- /dev/null +++ b/note_kfet/fixtures/cas.json @@ -0,0 +1,11 @@ +[ + { + "model": "cas_server.servicepattern", + "pk": 1, + "fields": { + "pos": 1, + "pattern": ".*", + "name": "REPLACEME" + } + } +] diff --git a/note_kfet/fixtures/initial.json b/note_kfet/fixtures/initial.json index 1b779980..72e47234 100644 --- a/note_kfet/fixtures/initial.json +++ b/note_kfet/fixtures/initial.json @@ -6,14 +6,5 @@ "domain": "localhost", "name": "La Note Kfet \ud83c\udf7b" } - }, - { - "model": "cas_server.servicepattern", - "pk": 1, - "fields": { - "pos": 1, - "pattern": ".*", - "name": "REPLACEME" - } } -] \ No newline at end of file +] diff --git a/note_kfet/settings/base.py b/note_kfet/settings/base.py index a1dbb929..4fe12fbf 100644 --- a/note_kfet/settings/base.py +++ b/note_kfet/settings/base.py @@ -128,7 +128,6 @@ PASSWORD_HASHERS = [ AUTHENTICATION_BACKENDS = ( 'django.contrib.auth.backends.ModelBackend', # this is default - 'guardian.backends.ObjectPermissionBackend', ) REST_FRAMEWORK = { @@ -143,10 +142,6 @@ REST_FRAMEWORK = { ] } -ANONYMOUS_USER_NAME = None # Disable guardian anonymous user - -GUARDIAN_GET_CONTENT_TYPE = 'polymorphic.contrib.guardian.get_polymorphic_base_content_type' - # Internationalization # https://docs.djangoproject.com/en/2.2/topics/i18n/ diff --git a/templates/base.html b/templates/base.html index 6814bedf..887bc970 100644 --- a/templates/base.html +++ b/templates/base.html @@ -67,16 +67,19 @@ SPDX-License-Identifier: GPL-3.0-or-later