SAK-44770 lessons > page settings does not reflect custom tool title …

…from ToolConfiguration (sakaiproject#8888)
bot2012 · Dec 10, 2020 · 85a13ae · 85a13ae
1 parent d740b09
commit 85a13ae
Showing 1 changed file with 9 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
@@ -4957,7 +4957,15 @@ private void createEditTitleDialog(UIContainer tofill, SimplePage page, SimplePa
 		makeCsrf(form, "csrf14");
 
 		UIOutput.make(form, "pageTitleLabel", messageLocator.getMessage("simplepage.pageTitle_label"));
-		UIInput.make(form, "pageTitle", "#{simplePageBean.pageTitle}");
+
+		String internalPageTitle = page.getTitle();
+		String externalPageTitle = simplePageBean.getCurrentSite().getPage(page.getToolId()).getTools().stream()
+				.filter(t -> t.getId().equals(toolManager.getCurrentPlacement().getId()))
+				.findFirst()
+				.map(t -> t.getTitle())
+				.orElse("");
+		String effectivePageTitle = (StringUtils.isNotBlank(externalPageTitle) && !externalPageTitle.equals(internalPageTitle)) ? externalPageTitle : internalPageTitle;
+		UIInput.make(form, "pageTitle", "#{simplePageBean.pageTitle}", effectivePageTitle);
 
 		if (!simplePageBean.isStudentPage(page)) {
 			UIOutput.make(tofill, "hideContainer");