Fb jsp print (#73)

Author: labkey-adam

src/org/labkey/trialshare/view/publicationDetails.jsp

@@ -1,21 +1,22 @@
 <%
-    /*
-     * Copyright (c) 2016 LabKey Corporation
-     *
-     * Licensed under the Apache License, Version 2.0 (the "License");
-     * you may not use this file except in compliance with the License.
-     * You may obtain a copy of the License at
-     *
-     *     http://www.apache.org/licenses/LICENSE-2.0
-     *
-     * Unless required by applicable law or agreed to in writing, software
-     * distributed under the License is distributed on an "AS IS" BASIS,
-     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     * See the License for the specific language governing permissions and
-     * limitations under the License.
-     */
+/*
+ * Copyright (c) 2016 LabKey Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 %>
 <%@ page import="org.json.JSONObject" %>
+<%@ page import="org.labkey.api.util.JavaScriptFragment" %>
 <%@ page import="org.labkey.api.util.UniqueID" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
@@ -35,7 +36,7 @@
 
     String renderId = "publication-details-" + UniqueID.getRequestScopedUID(HttpView.currentRequest());
 
-    String cubeObjectJson = bean.getCubeObject() == null ? "null" : new JSONObject(bean.getCubeObject()).toString(2);
+    JavaScriptFragment cubeObjectJson = bean.getCubeObject() == null ? JavaScriptFragment.NULL : new JSONObject(bean.getCubeObject()).getJavaScriptFragment(2);
 %>
 
 <labkey:errors/>
@@ -48,7 +49,7 @@
             mode: "<%=h(bean.getMode())%>",
             objectName : 'Publication',
             renderTo: <%=q(renderId)%>,
-            cubeObject : <%= text( cubeObjectJson )%>,
+            cubeObject : <%=cubeObjectJson%>,
             cubeContainerPath: "<%=h(bean.getCubeContainerPath())%>"
         });
     });

src/org/labkey/trialshare/view/studyDetails.jsp

@@ -1,22 +1,23 @@
 <%
-    /*
-     * Copyright (c) 2016 LabKey Corporation
-     *
-     * Licensed under the Apache License, Version 2.0 (the "License");
-     * you may not use this file except in compliance with the License.
-     * You may obtain a copy of the License at
-     *
-     *     http://www.apache.org/licenses/LICENSE-2.0
-     *
-     * Unless required by applicable law or agreed to in writing, software
-     * distributed under the License is distributed on an "AS IS" BASIS,
-     * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     * See the License for the specific language governing permissions and
-     * limitations under the License.
-     */
+/*
+ * Copyright (c) 2016 LabKey Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 %>
 <%@ page import="org.json.JSONArray" %>
 <%@ page import="org.json.JSONObject" %>
+<%@ page import="org.labkey.api.util.JavaScriptFragment" %>
 <%@ page import="org.labkey.api.util.UniqueID" %>
 <%@ page import="org.labkey.api.view.HttpView" %>
 <%@ page import="org.labkey.api.view.JspView" %>
@@ -39,7 +40,7 @@
     TrialShareController.CubeObjectDetailForm bean = me.getModelBean();
 
     String renderId = "study-details-" + UniqueID.getRequestScopedUID(HttpView.currentRequest());
-    String cubeObjectJson = bean.getCubeObject() == null ? "null" : new JSONObject(bean.getCubeObject()).toString(2);
+    JavaScriptFragment cubeObjectJson = bean.getCubeObject() == null ? JavaScriptFragment.NULL : new JSONObject(bean.getCubeObject()).getJavaScriptFragment(2);
     List<StudyAccess> accessList = bean.getCubeObject() == null ? null :((StudyBean) bean.getCubeObject()).getStudyAccessList();
 
     JSONArray jsonArray = new JSONArray();
@@ -51,7 +52,7 @@
         }
     }
 
-    String studyaccesslist = jsonArray.toString(2);
+    JavaScriptFragment studyaccesslist = jsonArray.getJavaScriptFragment(2);
 %>
 <labkey:errors/>
 <div id="<%= h(renderId)%>" class="requests-editor"></div>
@@ -64,8 +65,8 @@
             objectName : 'Study',
             renderTo: <%=q(renderId)%>,
             accessListId : <%= bean.getAccessListId() %>,
-            cubeObject : <%= text( cubeObjectJson )%>,
-            studyaccesslist: <%= text( studyaccesslist )%>,
+            cubeObject : <%= cubeObjectJson %>,
+            studyaccesslist: <%= studyaccesslist %>,
             cubeContainerPath: "<%=h(bean.getCubeContainerPath())%>"
         });
     });