LSNBLDR-633: Restrict editing of Lessons pages and subpages to one pe…

…rson (sakaiproject#4347) LSNBLDR-633: Restrict editing of Lessons pages and subpages to one person LSNBLDR-633: indentation
thakursir · Jun 29, 2017 · 7a1b1d1 · 7a1b1d1
1 parent 8d2d157
commit 7a1b1d1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...r/components/src/java/org/sakaiproject/lessonbuildertool/model/SimplePageToolDaoImpl.java b/...r/components/src/java/org/sakaiproject/lessonbuildertool/model/SimplePageToolDaoImpl.java
@@ -953,7 +953,11 @@ public String getPageUrl(long pageId) {
 	}
 
 	public List<SimplePage> getSitePages(String siteId) {
-	    DetachedCriteria d = DetachedCriteria.forClass(SimplePage.class).add(Restrictions.eq("siteId", siteId)).add(Restrictions.isNull("owner"));
+	    DetachedCriteria d = DetachedCriteria.forClass(SimplePage.class).add(Restrictions.eq("siteId", siteId))
+		    .add(Restrictions.disjunction()
+				    .add(Restrictions.isNull("owner"))
+				    .add(Restrictions.eq("owned", true))
+		    );
 
 		List<SimplePage> l = (List<SimplePage>) getHibernateTemplate().findByCriteria(d);
 

diff --git a/...onbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/beans/SimplePageBean.java b/...onbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/beans/SimplePageBean.java
@@ -7045,7 +7045,7 @@ public void addStudentContentSection() {
 		if (!checkCsrf())
 		    return;
 
-		if(getCurrentPage().getOwner() == null) {
+		if(canEditPage()) {
 			SimplePageItem item = appendItem("", messageLocator.getMessage("simplepage.student-content"), SimplePageItem.STUDENT_CONTENT);
 			item.setDescription(messageLocator.getMessage("simplepage.student-content"));
 			saveItem(item);