Merge branch 'master' into fix/ga-default-config

uPortal-Project · Sep 17, 2024 · f456990 · f456990
2 parents 1f6bb61 + d6bb8f5
commit f456990
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 28 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/...-events/src/main/java/org/apereo/portal/utils/cache/PersonDirectoryCacheKeyGenerator.java b/...-events/src/main/java/org/apereo/portal/utils/cache/PersonDirectoryCacheKeyGenerator.java
@@ -78,6 +78,7 @@ public Serializable generateKey(MethodInvocation methodInvocation) {
                 // Both methods that take a Map argument can just have the first argument returned
             case PEOPLE_MAP:
             case PEOPLE_MULTIVALUED_MAP:
+            case PEOPLE_MULTIVALUED_MAP_FILTER:
             case MULTIVALUED_USER_ATTRIBUTES__MAP:
             case USER_ATTRIBUTES__MAP:
                 {
@@ -250,6 +251,10 @@ public enum CachableMethod {
         PERSON_STR("getPerson", String.class),
         PEOPLE_MAP("getPeople", Map.class),
         PEOPLE_MULTIVALUED_MAP("getPeopleWithMultivaluedAttributes", Map.class),
+        PEOPLE_MULTIVALUED_MAP_FILTER(
+                "getPeopleWithMultivaluedAttributes",
+                Map.class,
+                org.apereo.services.persondir.IPersonAttributeDaoFilter.class),
         POSSIBLE_USER_ATTRIBUTE_NAMES("getPossibleUserAttributeNames"),
         AVAILABLE_QUERY_ATTRIBUTES("getAvailableQueryAttributes");
 

diff --git a/uPortal-webapp/package.json b/uPortal-webapp/package.json
@@ -5,6 +5,6 @@
     "compile-less": "lessc build/generated-sources/skin/main/webapp/media/skins/respondr/defaultSkin.less build/generated-sources/skin/main/webapp/media/skins/respondr/defaultSkin.css"
   },
   "devDependencies": {
-    "less": "^3.13.0"
+    "less": "^4.2.0"
   }
 }
diff --git a/uPortal-webapp/src/main/webapp/media/skins/respondr/common/less/content.less b/uPortal-webapp/src/main/webapp/media/skins/respondr/common/less/content.less
@@ -326,15 +326,15 @@ section.emergency-alert {
 /* large screens show all 6 columns. */
 @media only screen and (min-width: @screen-sm-min) {
   .portal-page-column.col-md-2 {
-    width: percentage(1 / 6);
+    width: percentage( (1/6) );
     float: left;
   }
 }
 
 @media only screen and (max-width: @screen-xs-max) {
   /* collapse from 6 to 3 columns */
   .portal-page-column.col-md-2 {
-    width: percentage(1 / 3);
+    width: percentage( (1/3) );
     float: left;
   }
 }
@@ -343,14 +343,14 @@ section.emergency-alert {
 @media only screen and (max-width: (@screen-xs-max + @screen-xs-min) / 2) {
   /* collapse from 6 to 2 columns */
   .portal-page-column.col-md-2 {
-    width: percentage(1 / 2);
+    width: percentage( (1/2) );
     float: left;
   }
 }
 
 @media only screen and (max-width: @screen-xs-min / 2) {
   /* on really small screen collapse to a single column */
   .portal-page-column.col-md-2 {
-    width: percentage(1 / 1);
+    width: percentage( (1/1) );
   }
 }
diff --git a/uPortal-webapp/src/main/webapp/media/skins/respondr/common/less/grids.less b/uPortal-webapp/src/main/webapp/media/skins/respondr/common/less/grids.less
@@ -36,7 +36,7 @@
     .fl-reorderer-dropMarker {
       // required for drag and drop styling to work
       @media (min-width: @@interpolate-media-query) {
-        width: percentage(1 / @number-of-columns);
+        width: percentage( (1/@number-of-columns) );
       }
     }
   }