diff options
| author | Simo Sorce <simo@redhat.com> | 2014-05-20 14:18:21 -0400 |
|---|---|---|
| committer | Simo Sorce <simo@redhat.com> | 2014-05-20 16:29:44 -0400 |
| commit | 843785e747036935c542c845e2db6efcc0d49b1c (patch) | |
| tree | cd53f59ff1f05809e92946670d38779e5e5a0cc2 | |
| parent | 8d082183f55722777ef2ff4baaa0af9962c3ab2e (diff) | |
| download | ipsilon-843785e747036935c542c845e2db6efcc0d49b1c.tar.gz ipsilon-843785e747036935c542c845e2db6efcc0d49b1c.tar.xz ipsilon-843785e747036935c542c845e2db6efcc0d49b1c.zip | |
Fix handling of SP renames
Properly replace page self.url
Signed-off-by: Simo Sorce <simo@redhat.com>
| -rwxr-xr-x | ipsilon/providers/saml2/admin.py | 9 | ||||
| -rw-r--r-- | templates/master-admin.html | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/ipsilon/providers/saml2/admin.py b/ipsilon/providers/saml2/admin.py index a9fb9e0..552d655 100755 --- a/ipsilon/providers/saml2/admin.py +++ b/ipsilon/providers/saml2/admin.py @@ -122,14 +122,14 @@ class SPAdminPage(Page): self.backurl = parent.url self.url = '%s/sp/%s' % (parent.url, sp.name) - def form_standard(self, message=None, message_type=None): + def form_standard(self, message=None, message_type=None, newurl=None): return self._template('admin/providers/saml2_sp.html', message=message, message_type=message_type, title=self.title, name='saml2_sp_%s_form' % self.sp.name, backurl=self.backurl, action=self.url, - data=self.sp) + data=self.sp, newurl=newurl) def GET(self, *args, **kwargs): return self.form_standard() @@ -245,14 +245,15 @@ class SPAdminPage(Page): self.sp.save_properties() if 'rename' in results: rename = results['rename'] + self.url = '%s/sp/%s' % (self.parent.url, rename[1]) self.parent.rename_sp(rename[0], rename[1]) - message = "Properties succssfully changed" + message = "Properties successfully changed" message_type = "success" except Exception: # pylint: disable=broad-except message = "Failed to save data!" message_type = "error" - return self.form_standard(message, message_type) + return self.form_standard(message, message_type, self.url) def delete(self): self.parent.del_sp(self.sp.name) diff --git a/templates/master-admin.html b/templates/master-admin.html index a5a696d..ff5a9dd 100644 --- a/templates/master-admin.html +++ b/templates/master-admin.html @@ -9,6 +9,15 @@ <script src="{{ basepath }}/ui/js/jquery.js"></script> <script src="{{ basepath }}/ui/js/bootstrap.js"></script> <script src="{{ basepath }}/ui/js/patternfly.js"></script> + {% if newurl %} + <script> + $( document ).ready( + function() { + history.replaceState({} , document.title, "{{ newurl }}"); + } + ); + </script> + {% endif %} </head> <body> <nav class="navbar navbar-default navbar-pf" role="navigation"> |