Skip to content

Commit c4e351e

Browse files
committed
don't show closed verifications in search results
1 parent 3f0b8ad commit c4e351e

7 files changed

Lines changed: 8 additions & 477 deletions

File tree

WebContent/WEB-INF/jsp/calendar/calendarSearchJSON.jsp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@
2626
"userid" : "<s:property value="assessor.id"/>",
2727
"username" : "<s:property value="assessor.fname"/> <s:property value="assessor.lname"/>",
2828
"start" : "<s:date name="start" format="MM/dd/yyyy"/>",
29-
"end" : "<s:date name="end" format="MM/dd/yyyy"/>"
29+
"end" : "<s:date name="end" format="MM/dd/yyyy"/>",
30+
"status": "<s:property value="workflowStatus"/>"
3031
}
3132
</s:iterator>
3233

WebContent/dist/js/remediation_schedule.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

WebContent/src/remediation/remediation_schedule.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -335,9 +335,10 @@ $(function() {
335335
let s = verification.start;
336336
let e = verification.end;
337337
let t = verification.appid + " - " + verification.appname + " - " + verification.vuln;
338+
let status = verification.status;
338339
let aaid = verification.appid;
339340

340-
if (s != 'null' && e != 'null') {
341+
if (s != 'null' && e != 'null' && status == "In Queue") {
341342
let originalEventObject = $(this).data('eventObject');
342343
let copiedEventObject = $.extend({}, originalEventObject);
343344
copiedEventObject.allDay = true;

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<modelVersion>4.0.0</modelVersion>
33
<groupId>org.faction</groupId>
44
<artifactId>faction</artifactId>
5-
<version>1.3.8-SNAPSHOT</version>
5+
<version>1.3.8</version>
66
<packaging>war</packaging>
77
<name>Faction</name>
88
<scm>
99
<url>https://github.com/factionsecurity/faction.git</url>
1010
<connection>scm:git:https://github.com/factionsecurity/faction.git</connection>
1111
<developerConnection>
1212
scm:git:https://github.com/factionsecurity/faction.git</developerConnection>
13-
<tag>1.3.0</tag>
13+
<tag>1.3.8</tag>
1414
</scm>
1515
<properties>
1616
<aws.java.sdk.version>2.18.16</aws.java.sdk.version>

0 commit comments

Comments
 (0)