Skip to content

Issue 41014: fix flagging of flow FCSAnalysis wells#220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-kevink merged 1 commit into from
Jul 30, 2020
Merged

Issue 41014: fix flagging of flow FCSAnalysis wells #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions flow/src/org/labkey/flow/data/FlowObject.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,7 @@ public FlowObject(T expObject)
_expObject = expObject;
}

@Override
public T getExpObject()
{
return _expObject;
Expand Down
8 changes: 4 additions & 4 deletions flow/src/org/labkey/flow/view/setComment.jsp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -115,7 +115,7 @@ LABKEY.requiresExt3(function() {
'line-height': "18px",
display: "block",
visibility: "hidden",
background: "transparent url(<%=contextPath%>/_.gif) no-repeat 0 2px"
background: "transparent url(<%=h(contextPath)%>/_.gif) no-repeat 0 2px"
}
});
this.alignStatusIcon();
Expand All@@ -125,11 +125,11 @@ LABKEY.requiresExt3(function() {
switch (status)
{
case 'loading':
this.statusEl.setStyle("background-image", "url(<%=contextPath%>/<%=PageFlowUtil.extJsRoot()%>/resources/images/default/grid/loading.gif)");
this.statusEl.setStyle("background-image", "url(<%=h(contextPath)%>/<%=PageFlowUtil.extJsRoot()%>/resources/images/default/grid/loading.gif)");
this.statusEl.setStyle("color", "silver");
break;
case 'success':
this.statusEl.setStyle("background-image", "url(<%=contextPath%>/<%=PageFlowUtil.extJsRoot()%>/resources/images/default/tree/drop-yes.gif)");
this.statusEl.setStyle("background-image", "url(<%=h(contextPath)%>/<%=PageFlowUtil.extJsRoot()%>/resources/images/default/tree/drop-yes.gif)");
this.statusEl.setStyle("color", "green");
if (!this.delayHide)
{
Expand All@@ -138,7 +138,7 @@ LABKEY.requiresExt3(function() {
this.delayHide.delay(4000);
break;
case 'error':
this.statusEl.setStyle("background-image", "url(<%=contextPath%>/<%=PageFlowUtil.extJsRoot()%>/resources/images/default/form/exclamation.gif)")
this.statusEl.setStyle("background-image", "url(<%=h(contextPath)%>/<%=PageFlowUtil.extJsRoot()%>/resources/images/default/form/exclamation.gif)")
this.statusEl.setStyle("color", "red");
break;
}
Expand Down
2 changes: 1 addition & 1 deletion flow/src/org/labkey/flow/view/setGraphSize.jsp
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -142,7 +142,7 @@
<%
for (Map.Entry<String, String> entry : sizes.entrySet()) { %>
<div class="labkey-graph-size">
[<a class="<%=entry.getKey().equals(graphSize) ? "labkey-selected-link" : ""%>" name="graphSize<%=entry.getKey()%>" onclick="setGraphSize(<%=entry.getKey()%>)"><%=h(entry.getValue())%></a>]
[<a class="<%=h(entry.getKey().equals(graphSize) ? "labkey-selected-link" : "")%>" name="graphSize<%=h(entry.getKey())%>" onclick="setGraphSize(<%=h(entry.getKey())%>)"><%=h(entry.getValue())%></a>]
</div>
<% } %>
<img id="updateGraphSize" height="1" width="1" src="<%=getWebappURL("_.gif")%>">