Move adding property to filters
This commit is contained in:
parent
88f4f9099b
commit
82c7a03965
7 changed files with 20 additions and 22 deletions
|
@ -23,16 +23,7 @@ class UserModel(models.Model):
|
||||||
abstract = True
|
abstract = True
|
||||||
|
|
||||||
|
|
||||||
class NummiModel(UserModel):
|
class Account(UserModel):
|
||||||
@property
|
|
||||||
def adding(self):
|
|
||||||
return self._state.adding
|
|
||||||
|
|
||||||
class Meta:
|
|
||||||
abstract = True
|
|
||||||
|
|
||||||
|
|
||||||
class Account(NummiModel):
|
|
||||||
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
|
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
|
||||||
name = models.CharField(max_length=64, default=_("Account"), verbose_name=_("Name"))
|
name = models.CharField(max_length=64, default=_("Account"), verbose_name=_("Name"))
|
||||||
icon = models.SlugField(
|
icon = models.SlugField(
|
||||||
|
@ -72,7 +63,7 @@ class Account(NummiModel):
|
||||||
verbose_name_plural = _("Accounts")
|
verbose_name_plural = _("Accounts")
|
||||||
|
|
||||||
|
|
||||||
class AccountModel(NummiModel):
|
class AccountModel(UserModel):
|
||||||
account = models.ForeignKey(
|
account = models.ForeignKey(
|
||||||
Account,
|
Account,
|
||||||
on_delete=models.CASCADE,
|
on_delete=models.CASCADE,
|
||||||
|
@ -83,7 +74,7 @@ class AccountModel(NummiModel):
|
||||||
abstract = True
|
abstract = True
|
||||||
|
|
||||||
|
|
||||||
class Category(NummiModel):
|
class Category(UserModel):
|
||||||
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
|
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
|
||||||
name = models.CharField(
|
name = models.CharField(
|
||||||
max_length=64, default=_("Category"), verbose_name=_("Name")
|
max_length=64, default=_("Category"), verbose_name=_("Name")
|
||||||
|
@ -194,7 +185,7 @@ class Snapshot(AccountModel):
|
||||||
verbose_name_plural = _("Statements")
|
verbose_name_plural = _("Statements")
|
||||||
|
|
||||||
|
|
||||||
class Transaction(NummiModel):
|
class Transaction(UserModel):
|
||||||
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
|
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
|
||||||
name = models.CharField(
|
name = models.CharField(
|
||||||
max_length=256, default=_("Transaction"), verbose_name=_("Name")
|
max_length=256, default=_("Transaction"), verbose_name=_("Name")
|
||||||
|
@ -264,7 +255,7 @@ class Transaction(NummiModel):
|
||||||
verbose_name_plural = _("Transactions")
|
verbose_name_plural = _("Transactions")
|
||||||
|
|
||||||
|
|
||||||
class Invoice(NummiModel):
|
class Invoice(UserModel):
|
||||||
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
|
id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
|
||||||
name = models.CharField(
|
name = models.CharField(
|
||||||
max_length=256, default=_("Invoice"), verbose_name=_("Name")
|
max_length=256, default=_("Invoice"), verbose_name=_("Name")
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
{% block h2 %}{{ form.instance.icon|remix }}{{ form.instance }}{% endblock %}
|
{% block h2 %}{{ form.instance.icon|remix }}{{ form.instance }}{% endblock %}
|
||||||
{% block tables %}
|
{% block tables %}
|
||||||
{% if not form.instance.adding %}
|
{% if not form.instance|adding %}
|
||||||
<h3>{% translate "Statements" %}</h3>
|
<h3>{% translate "Statements" %}</h3>
|
||||||
{% include "main/table/snapshot.html" %}
|
{% include "main/table/snapshot.html" %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
{% load main_extras %}
|
{% load main_extras %}
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
{% block title %}
|
{% block title %}
|
||||||
{% if form.instance.adding %}
|
{% if form.instance|adding %}
|
||||||
{% block title_new %}{% endblock %}
|
{% block title_new %}{% endblock %}
|
||||||
{% else %}
|
{% else %}
|
||||||
{{ form.instance }}
|
{{ form.instance }}
|
||||||
|
@ -24,7 +24,7 @@
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
{% block body %}
|
{% block body %}
|
||||||
{% with instance=form.instance %}
|
{% with instance=form.instance %}
|
||||||
{% if instance.adding %}
|
{% if instance|adding %}
|
||||||
<h2 class="new">
|
<h2 class="new">
|
||||||
{% block h2_new %}{% endblock %}
|
{% block h2_new %}{% endblock %}
|
||||||
</h2>
|
</h2>
|
||||||
|
@ -36,7 +36,7 @@
|
||||||
{% block pre %}{% endblock %}
|
{% block pre %}{% endblock %}
|
||||||
<form method="post">
|
<form method="post">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
{% if instance.adding %}<input hidden name="next" value="{{ request.path }}" />{% endif %}
|
{% if instance|adding %}<input hidden name="next" value="{{ request.path }}" />{% endif %}
|
||||||
{{ form }}
|
{{ form }}
|
||||||
</form>
|
</form>
|
||||||
{% block tables %}{% endblock %}
|
{% block tables %}{% endblock %}
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
|
{% load main_extras %}
|
||||||
{% block fields %}
|
{% block fields %}
|
||||||
{% if form.non_field_errors %}
|
{% if form.non_field_errors %}
|
||||||
<ul class='errorlist'>
|
<ul class='errorlist'>
|
||||||
|
@ -25,11 +26,11 @@
|
||||||
<tr class="buttons">
|
<tr class="buttons">
|
||||||
<td colspan="2">
|
<td colspan="2">
|
||||||
{% block buttons %}
|
{% block buttons %}
|
||||||
{% if not form.instance.adding %}
|
{% if not form.instance|adding %}
|
||||||
<a class="del" href="{{ form.instance.get_delete_url }}">{% translate "Delete" %}</a>
|
<a class="del" href="{{ form.instance.get_delete_url }}">{% translate "Delete" %}</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<input type="reset" value="{% translate "Reset" %}" />
|
<input type="reset" value="{% translate "Reset" %}" />
|
||||||
{% if form.instance.adding %}
|
{% if form.instance|adding %}
|
||||||
<input type="submit" value="{% translate "Create" %}" />
|
<input type="submit" value="{% translate "Create" %}" />
|
||||||
{% else %}
|
{% else %}
|
||||||
<input type="submit" value="{% translate "Save" %}" />
|
<input type="submit" value="{% translate "Save" %}" />
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
<h3>{% translate "Categories" %}</h3>
|
<h3>{% translate "Categories" %}</h3>
|
||||||
{% include "main/plot/category.html" %}
|
{% include "main/plot/category.html" %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% if not form.instance.adding %}
|
{% if not form.instance|adding %}
|
||||||
<h3>{% translate "Transactions" %} ({{ form.instance.sum|pmvalue }} / {{ form.instance.diff|pmvalue }})</h3>
|
<h3>{% translate "Transactions" %} ({{ form.instance.sum|pmvalue }} / {{ form.instance.diff|pmvalue }})</h3>
|
||||||
{% include "main/table/transaction.html" %}
|
{% include "main/table/transaction.html" %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
{% extends "main/form/base.html" %}
|
{% extends "main/form/base.html" %}
|
||||||
{% load i18n %}
|
{% load i18n %}
|
||||||
|
{% load main_extras %}
|
||||||
{% block title_new %}
|
{% block title_new %}
|
||||||
{% translate "Create transaction" %}
|
{% translate "Create transaction" %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
@ -14,7 +15,7 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
{% block tables %}
|
{% block tables %}
|
||||||
{% if not form.instance.adding %}
|
{% if not form.instance|adding %}
|
||||||
<h3>{% translate "Invoices" %}</h3>
|
<h3>{% translate "Invoices" %}</h3>
|
||||||
{% include "main/table/invoice.html" %}
|
{% include "main/table/invoice.html" %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
|
@ -54,3 +54,8 @@ def extension(file):
|
||||||
@register.filter
|
@register.filter
|
||||||
def verbose_name(obj):
|
def verbose_name(obj):
|
||||||
return obj._meta.verbose_name
|
return obj._meta.verbose_name
|
||||||
|
|
||||||
|
|
||||||
|
@register.filter
|
||||||
|
def adding(obj):
|
||||||
|
return obj._state.adding
|
||||||
|
|
Loading…
Reference in a new issue