S2U-42 SAK-49311 Cannot change / add profile photo (#11958)

sakaiproject · Dec 12, 2023 · bc9b0f3 · bc9b0f3
1 parent 4f11d91
commit bc9b0f3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/profile2/api/src/java/org/sakaiproject/profile2/model/ProfileImage.java b/profile2/api/src/java/org/sakaiproject/profile2/model/ProfileImage.java
@@ -49,6 +49,7 @@ public class ProfileImage {
 	private String altText;
 	private String mimeType;
 	private boolean isDefault;
+	private boolean isInitials;
 
 	/**
 	 * Get access to the binary data from either the uploaded image or the base64 encoded data

diff --git a/profile2/impl/src/java/org/sakaiproject/profile2/logic/ProfileImageLogicImpl.java b/profile2/impl/src/java/org/sakaiproject/profile2/logic/ProfileImageLogicImpl.java
@@ -1116,8 +1116,9 @@ public ProfileImage getProfileAvatarInitials(String userUuid) {
 				image.setUploadedImage(bytes);
 			} else {
 				image.setExternalImageUrl(getUnavailableImageURL());
+				image.setDefault(true);
 			}
-			image.setDefault(true);
+			image.setInitials(true);
 			cache.put(userUuid, image);
 		}
 		return image;

diff --git a/webapi/src/main/java/org/sakaiproject/webapi/controllers/CardGameController.java b/webapi/src/main/java/org/sakaiproject/webapi/controllers/CardGameController.java
@@ -345,6 +345,6 @@ private Boolean hasDefaultImage(String userId, String siteId, boolean official)
             profileImage = profileImageLogic.getProfileImage(userId, null, null, ProfileConstants.PROFILE_IMAGE_MAIN, siteId);
         }
 
-        return profileImage.isDefault();
+        return profileImage.isDefault() || profileImage.isInitials();
     }
 }