Bug: Sections were missing in peer review history

factionsecurity · Dec 18, 2024 · 64ccc84 · 64ccc84
1 parent d9396b7
commit 64ccc84
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 7 deletions.
diff --git a/.github/release.yml b/.github/release.yml
@@ -1,6 +1,6 @@
 changelog:
   categories:
-    - title: 🎉 🚀 Features 🎉 🚀
+    - title: 🎉 🚀 Upgrades 🎉 🚀
       labels:
         - enhancement
     - title: 🐛 Bugfixes 🐛

diff --git a/WebContent/WEB-INF/jsp/assessment/AssessmentTextEditors.jsp b/WebContent/WEB-INF/jsp/assessment/AssessmentTextEditors.jsp
@@ -250,10 +250,10 @@
 							<option value="<s:property value='id'/>" title="<s:property value='user.fname'/> <s:property value='user.lname'/>"
 								global="<s:property value="global"/>"
 								<s:if test="global == true">
-								class='globalTemplate'>
+								class='globalTemplate'
 								</s:if><s:else>
-								class='userTemplate'>
-								</s:else>
+								class='userTemplate'
+								</s:else>>
 							<s:property value="title"/>
 							</option>
 						</s:iterator>
@@ -338,10 +338,10 @@
 							<option value="<s:property value='id'/>" title="<s:property value='user.fname'/> <s:property value='user.lname'/>"
 								global="<s:property value='global'/>"
 								<s:if test="global == true">
-								class='globalTemplate'>
+								class='globalTemplate'
 							</s:if><s:else>
-								class='userTemplate'>
-							</s:else>
+								class='userTemplate'
+							</s:else>>
 							<s:property value='title'/>
 							</option>
 						</s:iterator>

diff --git a/src/com/fuse/actions/assessment/TrackChanges.java b/src/com/fuse/actions/assessment/TrackChanges.java
@@ -409,6 +409,17 @@ public String getPRHistory() throws ParseException {
 				&& !pr.getAssessment().getAssessor().stream().anyMatch(usr -> usr.getId() == user.getId())) {
 			return ERROR;
 		}
+
+		this.sections.add("Default");
+		if(ReportFeatures.allowSections()) {
+
+			SystemSettings ems = (SystemSettings) em.createQuery("from SystemSettings").getResultList().stream()
+					.findFirst().orElse(null);
+
+			for(String section : ReportFeatures.getFeatures(ems.getFeatures())){
+				this.sections.add(section);
+			}
+		}
 
 		asmt = com.exportAssessment(em);
 		asmt.setAnswers(pr.getAssessment().getAnswers());