From 760352202ec205a059045e5da6c7a78ee6dfe4f3 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Tue, 29 Sep 2020 11:42:34 +0200 Subject: [PATCH] admin: fix get_form_class --- e2e/test_provider_saml.py | 1 + passbook/admin/views/utils.py | 2 +- passbook/providers/saml/models.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/e2e/test_provider_saml.py b/e2e/test_provider_saml.py index 984b3ad125..ec4afb1573 100644 --- a/e2e/test_provider_saml.py +++ b/e2e/test_provider_saml.py @@ -167,6 +167,7 @@ class TestProviderSAML(SeleniumTestCase): self.driver.find_element(By.ID, "id_uid_field").send_keys(Keys.ENTER) self.driver.find_element(By.ID, "id_password").send_keys(USER().username) self.driver.find_element(By.ID, "id_password").send_keys(Keys.ENTER) + sleep(1) self.wait_for_url("http://localhost:9009/") self.assertEqual( self.driver.find_element(By.CSS_SELECTOR, "pre").text, diff --git a/passbook/admin/views/utils.py b/passbook/admin/views/utils.py index 45bc21df04..e0f1547ecc 100644 --- a/passbook/admin/views/utils.py +++ b/passbook/admin/views/utils.py @@ -43,7 +43,7 @@ class InheritanceCreateView(CreateAssignPermView): ) except StopIteration as exc: raise Http404 from exc - return model.form(model) + return model().form def get_context_data(self, **kwargs: Any) -> Dict[str, Any]: kwargs = super().get_context_data(**kwargs) diff --git a/passbook/providers/saml/models.py b/passbook/providers/saml/models.py index f7a5300914..5f824961d7 100644 --- a/passbook/providers/saml/models.py +++ b/passbook/providers/saml/models.py @@ -163,7 +163,7 @@ class SAMLPropertyMapping(PropertyMapping): def __str__(self): name = self.friendly_name if self.friendly_name != "" else self.saml_name - return f"SAML Property Mapping {self.name} ({name})" + return f"{self.name} ({name})" class Meta: