replace deprecated text() with unsafe() (#67)

Author: labkey-matthewb

src/org/labkey/workflow/view/workflowList.jsp

@@ -34,7 +34,7 @@
 %>
 
 <labkey:errors></labkey:errors>
-<%= text(navigationLinks(bean.getProcessDefinitionName(), bean.getProcessDefinitionKey(), null)) %>
+<%= unsafe(navigationLinks(bean.getProcessDefinitionName(), bean.getProcessDefinitionKey(), null)) %>
 <br>
 <br>
 
@@ -49,5 +49,5 @@
 <%
     }
 %>
-<%= text(navigationLinks(bean.getProcessDefinitionName(), bean.getProcessDefinitionKey(), null)) %>
+<%= unsafe(navigationLinks(bean.getProcessDefinitionName(), bean.getProcessDefinitionKey(), null)) %>
 

src/org/labkey/workflow/view/workflowProcessInstance.jsp

@@ -57,7 +57,7 @@ There is no active process with id <%= h(bean.getId()) %>
     else
     {
 %>
-<%= text(navigationLinks(bean.getProcessDefinitionName(), bean.getProcessDefinitionKey(), null)) %>
+<%= unsafe(navigationLinks(bean.getProcessDefinitionName(), bean.getProcessDefinitionKey(), null)) %>
 
 <br>
 <br>
@@ -90,7 +90,7 @@ There is no active process with id <%= h(bean.getId()) %>
 <table class="labkey-proj">
     <tr class="<%=h(nextRowClass())%>">
         <td>Status</td>
-        <td><strong><%= text(bean.isActive() ? "Active" : "Inactive")%></strong></td>
+        <td><strong><%= unsafe(bean.isActive() ? "Active" : "Inactive")%></strong></td>
     </tr>
     <%
         if (bean.getInitiator() != null)
@@ -105,7 +105,7 @@ There is no active process with id <%= h(bean.getId()) %>
         }
     %>
 
-<%= text(variablesTableRows(bean.getVariables())) %>
+<%= unsafe(variablesTableRows(bean.getVariables())) %>
 <tr class="<%=h(nextRowClass())%>">
     <td class="labkey-workflow-detail-label">Current Job(s)</td>
 
@@ -222,7 +222,7 @@ There is no active process with id <%= h(bean.getId()) %>
     }
 %>
 </table>
-<%= text(dataAccessTable(bean.getVariables(), bean.canAccessData(getUser(), getContainer()))) %>
+<%= unsafe(dataAccessTable(bean.getVariables(), bean.canAccessData(getUser(), getContainer()))) %>
 <%
         if (bean.hasDiagram(getContainer()))
         {

src/org/labkey/workflow/view/workflowProcessStart.jsp

@@ -43,7 +43,7 @@
 %>
 <labkey:errors></labkey:errors>
 
-<%= text(navigationLinks(bean.getProcessDefinitionName(), bean.getProcessDefinitionKey(), null)) %>
+<%= unsafe(navigationLinks(bean.getProcessDefinitionName(), bean.getProcessDefinitionKey(), null)) %>
 <br><br>
 <%
     if (!bean.isDeployed(getContainer()))
@@ -72,7 +72,7 @@ No process deployed with key <%= h(bean.getProcessDefinitionKey()) %>
     if (bean.isDeployed(getContainer()))
     {
 %>
-<%= text(actionForm(bean.getProcessDefinitionName(), bean.getProcessDefinitionKey(),
+<%= unsafe(actionForm(bean.getProcessDefinitionName(), bean.getProcessDefinitionKey(),
         "javascript:startWorkflowProcess(" + qh(bean.getProcessDefinitionKey()) + ", ['" + StringUtils.join(fields.keySet(), "', '") + "', '" + StringUtils.join(hiddenFields.keySet(), "', '") + "'], " + qh(bean.getProcessDefinitionKey()) + ")",
         fields, hiddenFields))
 %>

src/org/labkey/workflow/view/workflowTask.jsp

@@ -49,7 +49,7 @@
         String changeAssigneeLabel = bean.getAssigneeId() == null ? "Assign" : "Reassign";
         boolean canChangeAssignee = bean.canClaim(getUser(), getContainer()) || (bean.isDelegated() && bean.canDelegate(getUser(), getContainer())) || bean.canAssign(getUser(), getContainer());
 %>
-<%= text(navigationLinks(bean.getProcessDefinitionName(getContainer()), bean.getProcessDefinitionKey(getContainer()), bean.getProcessInstanceId())) %>
+<%= unsafe(navigationLinks(bean.getProcessDefinitionName(getContainer()), bean.getProcessDefinitionKey(getContainer()), bean.getProcessInstanceId())) %>
 <br>
 <br>
 <table class="labkey-proj">
@@ -97,7 +97,7 @@
 <table class="labkey-proj">
     <tr class="<%=h(nextRowClass())%>">
         <td>Status</td>
-        <td><strong><%= text(bean.isActive() ? "Active" : "Inactive") %></strong></td>
+        <td><strong><%= unsafe(bean.isActive() ? "Active" : "Inactive") %></strong></td>
     </tr>
     <%
         if (bean.getOwner() != null)
@@ -122,9 +122,9 @@
         }
     %>
 
-<%= text(variablesTableRows(bean.getVariables())) %>
+<%= unsafe(variablesTableRows(bean.getVariables())) %>
 </table>
-<%= text(dataAccessTable(bean.getVariables(), bean.canAccessData(getUser(), getContainer()))) %>
+<%= unsafe(dataAccessTable(bean.getVariables(), bean.canAccessData(getUser(), getContainer()))) %>
 
 <br>
 <%
@@ -149,7 +149,7 @@
             else
             {
 %>
-<%= text(actionForm(bean.getName(), bean.getTaskDefinitionKey(),
+<%= unsafe(actionForm(bean.getName(), bean.getTaskDefinitionKey(),
         "javascript:completeWorkflowTask(" + q(bean.getId()) + "," + qh(bean.getTaskDefinitionKey()) + ", ['" + StringUtils.join(fields.keySet(), "', '") + "']," + q(bean.getProcessInstanceId()) + ", " + qh(bean.getProcessDefinitionKey(getContainer())) + ")", fields, null)) %>
 <br>
 <%