diff --git a/app/apps/rules/migrations/0005_alter_transactionruleaction_rule.py b/app/apps/rules/migrations/0005_alter_transactionruleaction_rule.py new file mode 100644 index 0000000..e390932 --- /dev/null +++ b/app/apps/rules/migrations/0005_alter_transactionruleaction_rule.py @@ -0,0 +1,19 @@ +# Generated by Django 5.1.3 on 2024-12-27 05:09 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('rules', '0004_alter_transactionruleaction_field'), + ] + + operations = [ + migrations.AlterField( + model_name='transactionruleaction', + name='rule', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='transaction_actions', to='rules.transactionrule', verbose_name='Rule'), + ), + ] diff --git a/app/apps/rules/models.py b/app/apps/rules/models.py index d8fd6c6..a33cc13 100644 --- a/app/apps/rules/models.py +++ b/app/apps/rules/models.py @@ -31,7 +31,7 @@ class TransactionRuleAction(models.Model): rule = models.ForeignKey( TransactionRule, on_delete=models.CASCADE, - related_name="actions", + related_name="transaction_actions", verbose_name=_("Rule"), ) field = models.CharField( diff --git a/app/apps/rules/tasks.py b/app/apps/rules/tasks.py index d0f8381..f67f72e 100644 --- a/app/apps/rules/tasks.py +++ b/app/apps/rules/tasks.py @@ -68,7 +68,7 @@ def check_for_transaction_rules( for rule in rules: if simple.eval(rule.trigger): - for action in rule.actions.all(): + for action in rule.transaction_actions.all(): if action.field in [ TransactionRuleAction.Field.type, TransactionRuleAction.Field.is_paid, diff --git a/app/templates/rules/fragments/transaction_rule/view.html b/app/templates/rules/fragments/transaction_rule/view.html index 2ba4d95..eafc7c1 100644 --- a/app/templates/rules/fragments/transaction_rule/view.html +++ b/app/templates/rules/fragments/transaction_rule/view.html @@ -29,7 +29,7 @@