SAK-46635 dashboards. Separate site icon and course image (sakaiproje…

…ct#12270)
axxter99 · Jan 12, 2024 · 4745489 · 4745489
1 parent dbb2b5a
commit 4745489
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/kernel/api/src/main/java/org/sakaiproject/site/api/Site.java b/kernel/api/src/main/java/org/sakaiproject/site/api/Site.java
@@ -89,6 +89,8 @@ public interface Site extends Edit, Comparable, Serializable, AuthzGroup
 	 */
 	public final static String PROP_LTI_INBOUND_ROLE_MAP = "lti_inbound_role_map";
 
+	public final static String PROP_COURSE_IMAGE_URL = "course_image_url";
+
 	/**
 	 * @return the user who created this.
 	 */

diff --git a/webapi/src/main/java/org/sakaiproject/webapi/controllers/DashboardController.java b/webapi/src/main/java/org/sakaiproject/webapi/controllers/DashboardController.java
@@ -279,7 +279,7 @@ public DashboardRestBean getSiteDashboard(@PathVariable String siteId) throws Us
                 bean.setTemplate((Integer) dashboardConfig.get("template"));
             }
             bean.setEditable(securityService.isSuperUser() || securityService.unlock(SiteService.SECURE_UPDATE_SITE, site.getReference()));
-            String imageUrl = site.getIconUrl();
+            String imageUrl = site.getProperties().getProperty(Site.PROP_COURSE_IMAGE_URL);
             if (StringUtils.isBlank(imageUrl)) {
                 imageUrl = "/webcomponents/images/central_park_lamp.jpg";
             }
@@ -329,16 +329,16 @@ public String saveSiteImage(HttpServletRequest req, @PathVariable String siteId)
 
             ContentResourceEdit edit;
             try {
-                edit = contentHostingService.editResource(collectionId + "site_icon_image.png");
+                edit = contentHostingService.editResource(collectionId + "course_image.png");
             } catch (IdUnusedException | PermissionException e) {
-                edit = contentHostingService.addResource(collectionId, "site_icon_image", ".png", 1);
+                edit = contentHostingService.addResource(collectionId, "course_image", ".png", 1);
             }
             edit.setContent(fi.get());
             edit.setContentLength(fi.getSize());
             edit.setContentType(fi.getContentType());
             contentHostingService.commitResource(edit, NotificationService.NOTI_NONE);
             Site site = siteService.getSite(siteId);
-            site.setIconUrl(edit.getUrl());
+            site.getProperties().addProperty(Site.PROP_COURSE_IMAGE_URL, edit.getUrl());
             siteService.save(site);
             return edit.getUrl();
         } catch (Exception e) {
-Original file line number
+Diff line change
@@ Expand Up @@
     	 */
     	public final static String PROP_LTI_INBOUND_ROLE_MAP = "lti_inbound_role_map";
+    	public final static String PROP_COURSE_IMAGE_URL = "course_image_url";
     	/**
     	 * @return the user who created this.
     	 */
@@ Expand Down @@