SAK-47170 Assignments > Students see stack trace on assignments and s…

…ubmissions with attachments if read resources permission is removed (sakaiproject#10433)
susowrc · Apr 22, 2022 · c59d7c1 · c59d7c1
1 parent afb98ae
commit c59d7c1
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 7 deletions.
diff --git a/assignment/tool/src/webapp/vm/assignment/assignment_macros.vm b/assignment/tool/src/webapp/vm/assignment/assignment_macros.vm
@@ -384,7 +384,7 @@
                     #if ($reference)
                         #set ($props = false)
                         #set ($props = $reference.Properties)
-                        #if ($!props)
+                        #if ($!props && !$!props.isEmpty())
                             <li>
                                 #if ($props.getBooleanProperty($props.NamePropIsCollection))
                                     <img src = "#imageLink($contentTypeImageService.getContentTypeImage("folder"))" border="0" alt="$tlang.getString("gen.folatt")" />

diff --git a/...t/tool/src/webapp/vm/assignment/chef_assignments_instructor_preview_grading_submission.vm b/...t/tool/src/webapp/vm/assignment/chef_assignments_instructor_preview_grading_submission.vm
@@ -93,7 +93,7 @@
                         #if ($reference)
                             #set ($props = false)
                             #set ($props = $reference.Properties)
-                            #if ($!props)
+                            #if ($!props && !$!props.isEmpty())
                                 <li>
                                     #if ($props.getBooleanProperty($props.NamePropIsCollection))
                                         <img src = "#imageLink($contentTypeImageService.getContentTypeImage("folder"))" border="0" alt="$tlang.getString("gen.folatt")" />

diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_review_edit.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_review_edit.vm
@@ -140,7 +140,7 @@
 									#if ($reference)
 										#set ($props = false)
 										#set ($props = $reference.Properties)
-										#if ($!props)
+										#if ($!props && !$!props.isEmpty())
 											<li>
 												#if ($props.getBooleanProperty($props.NamePropIsCollection))
 													<img src = "#imageLink($contentTypeImageService.getContentTypeImage("folder"))" border="0" alt="$tlang.getString("gen.folatt")" />

diff --git a/...nment/tool/src/webapp/vm/assignment/chef_assignments_student_view_feedback_attachments.vm b/...nment/tool/src/webapp/vm/assignment/chef_assignments_student_view_feedback_attachments.vm
@@ -12,7 +12,7 @@
 					#if ($reference)
 						#set ($props = false)
 						#set ($props = $reference.Properties)
-						#if ($!props)
+						#if ($!props && !$!props.isEmpty())
 							<li>
 								#if ($props.getBooleanProperty($props.NamePropIsCollection))
 									<img src = "#imageLink($contentTypeImageService.getContentTypeImage("folder"))" border="0" alt="$tlang.getString("gen.folatt")" />

diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_grade.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_grade.vm
@@ -287,7 +287,7 @@
                             #if ($reference)
                                 #set ($props = false)
                                 #set ($props = $reference.Properties)
-                                #if ($!props)
+                                #if ($!props && !$!props.isEmpty())
                                     <li>
                                         #if ($props.getBooleanProperty($props.NamePropIsCollection))
                                                 <img src = "#imageLink($contentTypeImageService.getContentTypeImage("folder"))" border="0" alt="$tlang.getString("gen.folatt")" />

diff --git a/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission.vm b/assignment/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission.vm
@@ -735,7 +735,7 @@ $(document).ready(function(){
 							#foreach ($attachment in $attachments) 
 								#set ($props = false)
 								#set ($props = $attachment.Properties) 
-								#if ($!props)
+								#if ($!props && !$!props.isEmpty())
 									<tr>
 										<td>
 											#if ($props.getBooleanProperty($props.NamePropIsCollection))

diff --git a/...nt/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission_confirmation.vm b/...nt/tool/src/webapp/vm/assignment/chef_assignments_student_view_submission_confirmation.vm
@@ -191,7 +191,7 @@
                             #if ($reference)
                                 #set ($props = false)
                                 #set ($props = $reference.Properties)
-                                #if ($!props)
+                                #if ($!props && !$!props.isEmpty())
                                     <li>$formattedText.escapeHtml($props.getPropertyFormatted($props.NamePropDisplayName))
 										#propertyDetails($props)
                                     </li>

diff --git a/kernel/api/src/main/java/org/sakaiproject/entity/api/ResourceProperties.java b/kernel/api/src/main/java/org/sakaiproject/entity/api/ResourceProperties.java
@@ -211,6 +211,20 @@ public interface ResourceProperties extends Serializable
 	 */
 	Iterator<String> getPropertyNames();
 
+	/**
+	 * Returns the number of defined properties
+	 *
+	 * @return the number of defined properties
+	 */
+	int size();
+
+	/**
+	 * Returns true if there are no defined properties
+	 *
+	 * @return true if there are no defined properties
+	 */
+	boolean isEmpty();
+
 	/**
 	 * Access a named property as a string (won't find multi-valued ones.)
 	 * 

diff --git a/kernel/kernel-util/src/main/java/org/sakaiproject/util/BaseResourceProperties.java b/kernel/kernel-util/src/main/java/org/sakaiproject/util/BaseResourceProperties.java
@@ -237,6 +237,18 @@ public Iterator<String> getPropertyNames()
 		return new EnumerationIterator(m_props.keys());
 	}
 
+	@Override
+	public int size()
+	{
+		return m_props.size();
+	}
+
+	@Override
+	public boolean isEmpty()
+	{
+		return m_props.isEmpty();
+	}
+
 	/**
 	 * Access a named property as a string (won't find multi-valued ones.)
 	 *