SAK-41847 Use tool ordered list of page items ... (sakaiproject#7151)

... when working out pre-requisites https://jira.sakaiproject.org/browse/SAK-41847
chundcm · Jul 24, 2019 · a661d80 · a661d80
1 parent 3f8ed66
commit a661d80
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/...r/components/src/java/org/sakaiproject/lessonbuildertool/model/SimplePageToolDaoImpl.java b/...r/components/src/java/org/sakaiproject/lessonbuildertool/model/SimplePageToolDaoImpl.java
@@ -1926,6 +1926,9 @@ public List<SimplePage> getTopLevelPages(final String siteId) {
 
 	}
 
+    /**
+     * Gets the top level page items, ordered to correspond with the top level lessons tools
+     */
     public List<SimplePageItem> getOrderedTopLevelPageItems(String siteId) {
 
         // The unordered top level items

diff --git a/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/LessonsAccess.java b/lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/service/LessonsAccess.java
@@ -406,7 +406,7 @@ public boolean isPageAccessible(long pageId, String siteId, String currentUserId
 
 			simplePageBean = makeSimplePageBean(simplePageBean, siteId, currentPage);
 
-			List<SimplePageItem> items = dao.findItemsInSite(siteId);
+			List<SimplePageItem> items = dao.getOrderedTopLevelPageItems(siteId);
 			// sorted by SQL
 
 			boolean ok = true;
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
+        /**
+         * Gets the top level page items, ordered to correspond with the top level lessons tools
+         */
         public List<SimplePageItem> getOrderedTopLevelPageItems(String siteId) {
             // The unordered top level items
@@ Expand Down @@