SAK-46842 make number of dashboard home MOTDs configurable (sakaiproj…

…ect#10352)
stetsche · Mar 18, 2022 · 683a351 · 683a351
1 parent 4575c38
commit 683a351
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/.../configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties b/.../configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties
@@ -5757,6 +5757,10 @@ rubrics.integration.token-secret=12345678900909091234
 # DEFAULT: announcements,calendar,forums,grades"
 #dashboard.course.widgets=announcements,calendar
 
+# Configure the number of MOTDs to display in the home dashboard
+# DEFAULT: 1
+#dashboard.home.motd.display=3
+
 # Set the key rotation period - SAK-45491
 # For positive numbers this is the number of days before rotation happens
 # For negative numbers it is the number of minutes before rotation happens (for testing)

diff --git a/webapi/src/main/java/org/sakaiproject/webapi/controllers/DashboardController.java b/webapi/src/main/java/org/sakaiproject/webapi/controllers/DashboardController.java
@@ -95,6 +95,7 @@ public class DashboardController extends AbstractSakaiApiController {
     private List<String> homeWidgets = new ArrayList<>();
 
     private List<String> defaultHomeLayout = new ArrayList<>();
+    private int maxNumberMotd = 1;
 
     /** This will be the map of the default widget layouts, one entry for each template */
     private Map<String, List<String>> defaultWidgetLayouts = new HashMap<>();
@@ -134,6 +135,8 @@ public void init() {
             courseWidgetLayout3 = new String[] { "calendar", "announcements", "grades", "forums" };
         }
         defaultWidgetLayouts.put("3", Arrays.asList(courseWidgetLayout3));
+
+        maxNumberMotd = serverConfigurationService.getInt("dashboard.home.motd.display", 1);
     }
 
 	@GetMapping(value = "/users/{userId}/dashboard", produces = MediaType.APPLICATION_JSON_VALUE)
@@ -157,13 +160,15 @@ public DashboardRestBean getUserDashboard(@PathVariable String userId) throws Us
         try {
             List<AnnouncementMessage> motdMessages = announcementService.getMessages(
                 announcementService.getSummarizableReference(null, announcementService.MOTD_TOOL_ID),
-                new ViewableFilter(null, null, 1, announcementService),
+                new ViewableFilter(null, null, maxNumberMotd, announcementService),
                 false,
                 false);
 
-            if (motdMessages.size() > 0) {
-                bean.setMotd(motdMessages.get(motdMessages.size() - 1).getBody());
+            StringBuffer sb = new StringBuffer();
+            for (AnnouncementMessage motdMessage : motdMessages) {
+                sb.append(motdMessage.getBody());
             }
+            bean.setMotd(sb.toString());
         } catch (IdUnusedException idue) {
             log.debug("No MOTD set.");
         } catch (Exception e) {