allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject allura git commit: [#8242] Skip 404 page fix for permission page
Date Fri, 05 Oct 2018 21:25:26 GMT
Repository: allura
Updated Branches:
  refs/heads/master b0dbd6685 -> 4c5c9f969


[#8242] Skip 404 page fix for permission page


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/4c5c9f96
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/4c5c9f96
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/4c5c9f96

Branch: refs/heads/master
Commit: 4c5c9f96968f923201d8aae04e2e9e5ad9f8ed63
Parents: b0dbd66
Author: Shalitha Suranga <shalithasuranga@gmail.com>
Authored: Fri Oct 5 15:04:15 2018 +0530
Committer: Dave Brondsema <dbrondsema@slashdotmedia.com>
Committed: Fri Oct 5 21:22:34 2018 +0000

----------------------------------------------------------------------
 Allura/allura/ext/admin/admin_main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/4c5c9f96/Allura/allura/ext/admin/admin_main.py
----------------------------------------------------------------------
diff --git a/Allura/allura/ext/admin/admin_main.py b/Allura/allura/ext/admin/admin_main.py
index 468760f..e0c5369 100644
--- a/Allura/allura/ext/admin/admin_main.py
+++ b/Allura/allura/ext/admin/admin_main.py
@@ -704,7 +704,7 @@ class ProjectAdminController(BaseController):
             flash('%s: %s' % (exc.__class__.__name__, exc.args[0]),
                   'error')
         if request.referer is not None and tool is not None and 'delete' in tool[0] and \
-            re.search(c.project.url() + tool[0]['mount_point']+ r'\/*', request.referer):
+            re.search(c.project.url() + r'(admin\/|)' + tool[0]['mount_point']+ r'\/*', request.referer):
             # Redirect to root when deleting currect module
             redirect('../')
         redirect(request.referer)


Mime
View raw message