Changes sync

This commit is contained in:
Mikhail Podgurskiy
2024-02-16 13:19:48 +06:00
parent 209aea233a
commit e6939f19cf
4 changed files with 22 additions and 19 deletions

View File

@@ -6,6 +6,7 @@ files=viewflow/**/*.py
[flake8]
max-line-length = 130
ignore = D100, D105, D107, W503, E203
extend-ignore = W503
[coverage:report]
omit = ../*migrations*

View File

@@ -21,56 +21,56 @@ class Test(TestCase):
content = Template(
"{% load viewflow %}{% get_absolute_url site user %}"
).render(context)
self.assertEqual(f"/model/{self.user.pk}/change/", content)
self.assertEqual(f"/user/{self.user.pk}/change/", content)
content = Template(
"{% load viewflow %}{% get_absolute_url site user as var%}{{ var }}"
).render(context)
self.assertEqual(f"/model/{self.user.pk}/change/", content)
self.assertEqual(f"/user/{self.user.pk}/change/", content)
def test_reverse(self):
context = Context({"request": self.request, "viewset": site.viewsets[0], "user": self.user})
context = Context(
{"request": self.request, "viewset": site.viewsets[0], "user": self.user}
)
context.request = self.request
content = Template(
"{% load viewflow %}{% reverse viewset 'change' user.pk %}"
).render(context)
self.assertEqual(f"/model/{self.user.pk}/change/", content)
self.assertEqual(f"/user/{self.user.pk}/change/", content)
content = Template(
"{% load viewflow %}{% reverse viewset 'change' user.pk as var %}{{ var }}"
).render(context)
self.assertEqual(f"/model/{self.user.pk}/change/", content)
self.assertEqual(f"/user/{self.user.pk}/change/", content)
content = Template(
"{% load viewflow %}{% reverse viewset 'change' pk=user.pk %}"
).render(context)
self.assertEqual(f"/model/{self.user.pk}/change/", content)
self.assertEqual(f"/user/{self.user.pk}/change/", content)
def test_get_verbose_name(self):
context = Context({"model": User})
content = Template(
"{% load viewflow %}{{ model|verbose_name }}"
).render(context)
content = Template("{% load viewflow %}{{ model|verbose_name }}").render(
context
)
self.assertEqual("user", content)
context = Context({"user": self.user})
content = Template(
"{% load viewflow %}{{ user|verbose_name }}"
).render(context)
content = Template("{% load viewflow %}{{ user|verbose_name }}").render(context)
self.assertEqual("user", content)
def test_get_verbose_name_plural(self):
context = Context({"model": User})
content = Template(
"{% load viewflow %}{{ model|verbose_name_plural }}"
).render(context)
content = Template("{% load viewflow %}{{ model|verbose_name_plural }}").render(
context
)
self.assertEqual("users", content)
context = Context({"user": self.user})
content = Template(
"{% load viewflow %}{{ user|verbose_name_plural }}"
).render(context)
content = Template("{% load viewflow %}{{ user|verbose_name_plural }}").render(
context
)
self.assertEqual("users", content)
def _test_list_column_order(self):

View File

@@ -32,6 +32,8 @@ class BaseModelViewset(Viewset):
attr = super(BaseModelViewset, self).__getattribute__(name)
if name == "title" and attr is None:
return self.model._meta.verbose_name_plural.capitalize()
elif name == "app_name" and attr is None:
return self.model._meta.object_name.lower()
return attr
def filter_kwargs(self, view_class, **kwargs):

View File

@@ -6,7 +6,7 @@ from django.utils.timezone import now
from viewflow import fsm
from .context import context
from .signals import flow_started, task_started, task_finished, task_failed
from .signals import task_finished, task_failed
from .status import STATUS, PROCESS