You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/09/22 16:07:35 UTC
[2/2] allura git commit: [#7946] ticket:846 Don't insert redundant
csrf input in admin modals
[#7946] ticket:846 Don't insert redundant csrf input in admin modals
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/58634ef3
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/58634ef3
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/58634ef3
Branch: refs/heads/ib/7946
Commit: 58634ef32566058ace8f27291a719bf60d5c4257
Parents: 7068423
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue Sep 22 16:23:08 2015 +0300
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Tue Sep 22 16:23:08 2015 +0300
----------------------------------------------------------------------
Allura/allura/lib/widgets/resources/js/admin_modal.js | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/58634ef3/Allura/allura/lib/widgets/resources/js/admin_modal.js
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/widgets/resources/js/admin_modal.js b/Allura/allura/lib/widgets/resources/js/admin_modal.js
index 41a5264..b1a521d 100644
--- a/Allura/allura/lib/widgets/resources/js/admin_modal.js
+++ b/Allura/allura/lib/widgets/resources/js/admin_modal.js
@@ -17,8 +17,6 @@
under the License.
*/
$(function() {
- var cval = $.cookie('_session_id');
- var csrf_input = $('<input name="_session_id" type="hidden" value="'+cval+'">');
var $popup_title = $('#admin_modal_title');
var $popup_contents = $('#admin_modal_contents');
$('a.admin_modal').click(function () {
@@ -28,7 +26,12 @@ $(function() {
$.get(link.href, function (data) {
$popup_title.html($(link).html());
$popup_contents.html(data);
- $popup_contents.find('form').append(csrf_input);
+ var csrf_exists = $popup_contents.find('form > input[name="_session_id"]').length;
+ if (!csrf_exists) {
+ var cval = $.cookie('_session_id');
+ var csrf_input = $('<input name="_session_id" type="hidden" value="'+cval+'">');
+ $popup_contents.find('form').append(csrf_input);
+ }
});
});
});