SAK-50296 LTI Fix regression in add tool link (#12812)

sakaiproject · Aug 21, 2024 · b04325e · b04325e
1 parent 3c0f7f2
commit b04325e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/LTIService.java b/basiclti/basiclti-api/src/java/org/sakaiproject/lti/api/LTIService.java
@@ -106,7 +106,7 @@ public interface LTIService extends LTISubstitutionsFilter {
             "SITE_ID:text:maxlength=99:role=admin",
             "title:text:label=bl_title:required=true:maxlength=1024",
             "allowtitle:radio:label=bl_allowtitle:choices=disallow,allow",
-            "pagetitle:text:label=bl_pagetitle:maxlength=1024",
+            "pagetitle:text:label=bl_pagetitle:required=true:maxlength=1024",
             "allowpagetitle:radio:label=bl_allowpagetitle:choices=disallow,allow",
             "description:textarea:label=bl_description:maxlength=4096",
             "status:radio:label=bl_status:choices=enable,disable",
@@ -133,7 +133,7 @@ public interface LTIService extends LTISubstitutionsFilter {
             "pl_lessonsselection:checkbox:label=bl_pl_lessonsselection",
             "pl_contenteditor:checkbox:label=bl_pl_contenteditor",
             "pl_assessmentselection:checkbox:label=bl_pl_assessmentselection",
-            "pl_coursenav:checkbox:label=bl_pl_coursenav:role=admin",
+            "pl_coursenav:checkbox:label=bl_pl_coursenav",
             "pl_importitem:checkbox:label=bl_pl_importitem:role=admin",
             "pl_fileitem:checkbox:label=bl_pl_fileitem:role=admin:hidden=true",
             "toolorder:integer:label=bl_toolorder:hidden:advanced:maxlength=2",

diff --git a/basiclti/basiclti-tool/src/java/org/sakaiproject/blti/tool/LTIAdminTool.java b/basiclti/basiclti-tool/src/java/org/sakaiproject/blti/tool/LTIAdminTool.java
@@ -1720,7 +1720,8 @@ public String buildContentPutPanelContext(VelocityPortlet portlet, Context conte
 		if (previousData == null) {
 			Properties defaultData = new Properties();
 			defaultData.put("title", tool.get(LTIService.LTI_TITLE));
-			defaultData.put("pagetitle", tool.get(LTIService.LTI_PAGETITLE));
+			String pageTitle = (String) tool.get(LTIService.LTI_PAGETITLE);
+			if ( StringUtils.isNotEmpty(pageTitle) ) defaultData.put("pagetitle", pageTitle);
 			String fa_icon = (String) tool.get(LTIService.LTI_FA_ICON);
 			if (fa_icon != null && fa_icon.length() > 0) {
 				defaultData.put("fa_icon", tool.get(LTIService.LTI_FA_ICON));