Skip to content

Commit

Permalink
don't show closed verifications in search results
Browse files Browse the repository at this point in the history
  • Loading branch information
summitt committed Aug 9, 2024
1 parent 3f0b8ad commit c4e351e
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 477 deletions.
3 changes: 2 additions & 1 deletion WebContent/WEB-INF/jsp/calendar/calendarSearchJSON.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"userid" : "<s:property value="assessor.id"/>",
"username" : "<s:property value="assessor.fname"/> <s:property value="assessor.lname"/>",
"start" : "<s:date name="start" format="MM/dd/yyyy"/>",
"end" : "<s:date name="end" format="MM/dd/yyyy"/>"
"end" : "<s:date name="end" format="MM/dd/yyyy"/>",
"status": "<s:property value="workflowStatus"/>"
}
</s:iterator>

Expand Down
2 changes: 1 addition & 1 deletion WebContent/dist/js/remediation_schedule.js

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion WebContent/src/remediation/remediation_schedule.js
Original file line number Diff line number Diff line change
Expand Up @@ -335,9 +335,10 @@ $(function() {
let s = verification.start;
let e = verification.end;
let t = verification.appid + " - " + verification.appname + " - " + verification.vuln;
let status = verification.status;
let aaid = verification.appid;

if (s != 'null' && e != 'null') {
if (s != 'null' && e != 'null' && status == "In Queue") {
let originalEventObject = $(this).data('eventObject');
let copiedEventObject = $.extend({}, originalEventObject);
copiedEventObject.allDay = true;
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.faction</groupId>
<artifactId>faction</artifactId>
<version>1.3.8-SNAPSHOT</version>
<version>1.3.8</version>
<packaging>war</packaging>
<name>Faction</name>
<scm>
<url>https://github.com/factionsecurity/faction.git</url>
<connection>scm:git:https://github.com/factionsecurity/faction.git</connection>
<developerConnection>
scm:git:https://github.com/factionsecurity/faction.git</developerConnection>
<tag>1.3.0</tag>
<tag>1.3.8</tag>
</scm>
<properties>
<aws.java.sdk.version>2.18.16</aws.java.sdk.version>
Expand Down
Loading

0 comments on commit c4e351e

Please sign in to comment.