From 74d93bd4ab959ebf443fd6893277e802de1eb628 Mon Sep 17 00:00:00 2001
From: "Mark M. Florida" <markflorida@wustl.edu>
Date: Thu, 7 Jul 2016 19:32:32 -0500
Subject: [PATCH] XNAT-4268: set window.loggedIn variable to true in popup
templates - the user must be logged in to view the popup anyway.
---
src/main/webapp/xdat-templates/layouts/Popup.vm | 1 +
src/main/webapp/xnat-templates/layouts/Popup_empty.vm | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/main/webapp/xdat-templates/layouts/Popup.vm b/src/main/webapp/xdat-templates/layouts/Popup.vm
index 32e5113b..c4fc7c2e 100644
--- a/src/main/webapp/xdat-templates/layouts/Popup.vm
+++ b/src/main/webapp/xdat-templates/layouts/Popup.vm
@@ -11,6 +11,7 @@ $navigation.setTemplate("/htmlOpen.vm")
</style>
## insert any template-specific <head> code here
<script type="text/javascript">
+ window.loggedIn = true; // just assume we're logged in - how else would we get here?
window.isPopup = true;
jq(function(){
jq('body').addClass('popup');
diff --git a/src/main/webapp/xnat-templates/layouts/Popup_empty.vm b/src/main/webapp/xnat-templates/layouts/Popup_empty.vm
index 703f6066..ac6bcf11 100644
--- a/src/main/webapp/xnat-templates/layouts/Popup_empty.vm
+++ b/src/main/webapp/xnat-templates/layouts/Popup_empty.vm
@@ -2,6 +2,7 @@ $navigation.setTemplate("/htmlOpen.vm")
## insert any template-specific <head> code here
<script type="text/javascript">
+ window.loggedIn = true;
window.isPopup=true;
jq(function(){
jq('body').addClass('popup');
--
GitLab