SAK-40604 Update ShowPageProducer.java, show-page.js (sakaiproject#6221)

susowrc · Nov 6, 2018 · c391d1c · c391d1c
1 parent ac32328
commit c391d1c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/...der/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowPageProducer.java b/...der/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowPageProducer.java
@@ -1084,8 +1084,17 @@ public int compare(SimpleStudentPage o1, SimpleStudentPage o2) {
 		    } catch (Exception e) {}
 		}
 
+		List<SimplePageItem> itemList = null;
+
 		// items to show
-		List<SimplePageItem> itemList = (List<SimplePageItem>) simplePageBean.getItemsOnPage(currentPage.getPageId());
+		if(httpServletRequest.getParameter("printall") != null && currentPage.getTopParent() != null)
+		{
+			itemList = (List<SimplePageItem>) simplePageBean.getItemsOnPage(currentPage.getTopParent());
+		}
+		else
+		{
+			itemList = (List<SimplePageItem>) simplePageBean.getItemsOnPage(currentPage.getPageId());
+		}
 
 		// Move all items with sequence <= 0 to the end of the list.
 		// Count is necessary to guarantee we don't infinite loop over a

diff --git a/lessonbuilder/tool/src/webapp/js/show-page.js b/lessonbuilder/tool/src/webapp/js/show-page.js
@@ -3532,7 +3532,11 @@ function printViewWithParameter(url) {
     var j = url.indexOf("/tool/");
     if (j < 0)
 	return url;
+    var z = url.indexOf("ShowPage");
+    if (z < 0)
     return url.substring(0, i) + url.substring(j) + '?printall=true';
+    else
+    return url.substring(0, i) + url.substring(j) + '&printall=true';
 }
 
 // make columns in a section the same height. Is there a better place to trigger this?