habsi/authentik
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flows: revert evaluate_on_call rename for backwards compatibility

Browse Source
This commit is contained in:
Jens Langhammer
2020-10-20 15:41:50 +02:00
parent 061eab4b36
commit ef021495ef
14 changed files with 36 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
passbook/flows/api.py
View File

@ -32,7 +32,7 @@ class FlowStageBindingSerializer(ModelSerializer):
"target",
"stage",
"evaluate_on_plan",
"evaluate_on_call",
"re_evaluate_policies",
"order",
"policies",
]

2
passbook/flows/forms.py
View File

@ -51,7 +51,7 @@ class FlowStageBindingForm(forms.ModelForm):
"target",
"stage",
"evaluate_on_plan",
"evaluate_on_call",
"re_evaluate_policies",
"order",
]
widgets = {

7
passbook/flows/migrations/0015_flowstagebinding_evaluate_on_plan.py
View File

@ -10,14 +10,9 @@ class Migration(migrations.Migration):
]
operations = [
migrations.RenameField(
model_name="flowstagebinding",
old_name="re_evaluate_policies",
new_name="evaluate_on_call",
),
migrations.AlterField(
model_name="flowstagebinding",
name="evaluate_on_call",
name="re_evaluate_policies",
field=models.BooleanField(
default=False,
help_text="Evaluate policies when the Stage is present to the user.",

2
passbook/flows/models.py
View File

@ -163,7 +163,7 @@ class FlowStageBinding(SerializerModel, PolicyBindingModel):
)
),
)
evaluate_on_call = models.BooleanField(
re_evaluate_policies = models.BooleanField(
default=False,
help_text=_("Evaluate policies when the Stage is present to the user."),
)

2
passbook/flows/planner.py
View File

@ -185,7 +185,7 @@ class FlowPlanner:
stage=binding.stage,
flow=self.flow,
)
if binding.evaluate_on_call and stage:
if binding.re_evaluate_policies and stage:
LOGGER.debug(
"f(plan): Stage has re-evaluate marker",
stage=binding.stage,

4
passbook/flows/tests/test_planner.py
View File

@ -132,7 +132,7 @@ class TestFlowPlanner(TestCase):
target=flow,
stage=DummyStage.objects.create(name="dummy1"),
order=0,
evaluate_on_call=True,
re_evaluate_policies=True,
)
request = self.request_factory.get(
@ -161,7 +161,7 @@ class TestFlowPlanner(TestCase):
target=flow,
stage=DummyStage.objects.create(name="dummy2"),
order=1,
evaluate_on_call=True,
re_evaluate_policies=True,
)
PolicyBinding.objects.create(policy=false_policy, target=binding2, order=0)

8
passbook/flows/tests/test_views.py
View File

@ -174,7 +174,7 @@ class TestFlowExecutor(TestCase):
target=flow,
stage=DummyStage.objects.create(name="dummy2"),
order=1,
evaluate_on_call=True,
re_evaluate_policies=True,
)
PolicyBinding.objects.create(policy=false_policy, target=binding2, order=0)
@ -225,7 +225,7 @@ class TestFlowExecutor(TestCase):
target=flow,
stage=DummyStage.objects.create(name="dummy2"),
order=1,
evaluate_on_call=True,
re_evaluate_policies=True,
)
binding3 = FlowStageBinding.objects.create(
target=flow, stage=DummyStage.objects.create(name="dummy3"), order=2
@ -292,13 +292,13 @@ class TestFlowExecutor(TestCase):
target=flow,
stage=DummyStage.objects.create(name="dummy2"),
order=1,
evaluate_on_call=True,
re_evaluate_policies=True,
)
binding3 = FlowStageBinding.objects.create(
target=flow,
stage=DummyStage.objects.create(name="dummy3"),
order=2,
evaluate_on_call=True,
re_evaluate_policies=True,
)
binding4 = FlowStageBinding.objects.create(
target=flow, stage=DummyStage.objects.create(name="dummy4"), order=2