Index: lams_tool_laqa/web/authoring/conditions.jsp
===================================================================
diff -u -r0a6aca952e6053ca9ef35fb5bd2e672e5d432be6 -r2f53601ac19db5f846eb50d31a111e12ff136a0a
--- lams_tool_laqa/web/authoring/conditions.jsp	(.../conditions.jsp)	(revision 0a6aca952e6053ca9ef35fb5bd2e672e5d432be6)
+++ lams_tool_laqa/web/authoring/conditions.jsp	(.../conditions.jsp)	(revision 2f53601ac19db5f846eb50d31a111e12ff136a0a)
@@ -1,5 +1,4 @@
 <%@ include file="/common/taglibs.jsp"%>
-<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 <script type="text/javascript">
 	function showConditionMessage(url) {
 		$.ajaxSetup({ cache: true });
@@ -49,12 +48,12 @@
 
 <!-- Conditions Tab Content -->
 <div id="conditionsArea">
-	<c:set var="sessionMapID" value="${formBean.httpSessionID}" />
+	<c:set var="sessionMapID" value="${QaConditionForm.httpSessionID}" />
 	<%@ include file="/authoring/conditionList.jsp"%>
 </div>
  
  <div class="form-inline">
-	<a href="javascript:showConditionMessage('<html:rewrite page="/authoring/newConditionInit.do?sessionMapID=${formBean.httpSessionID}"/>');" 
+	<a href="javascript:showConditionMessage('<lams:WebAppURL/> authoring/newConditionInit.do?sessionMapID=${QaConditionForm.httpSessionID}');" 
 		class="btn btn-default btn-sm"><i class="fa fa-plus"></i>&nbsp;<fmt:message key="label.authoring.conditions.add.condition" /></a> 
 </div>