Feature #12629

Silverpeas · Oct 8, 2021 · 18a9205 · 18a9205
1 parent 039458c
commit 18a9205
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/...n/src/main/config/properties/org/silverpeas/util/viewGenerator/settings/Aurora.properties b/...n/src/main/config/properties/org/silverpeas/util/viewGenerator/settings/Aurora.properties
@@ -214,6 +214,7 @@ home.search.extrafield.space = false
 home.publications.nb = 3
 home.publications.spaceid =
 home.publications.components.excluded =
+home.publications.spaces.excluded =
 
 # Turn this to false to display first main space as homepage only if regular user has access to no news
 home.displayedWhenNoNews = true

diff --git a/aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/LookAuroraHelper.java b/aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/LookAuroraHelper.java
@@ -1,5 +1,6 @@
 package org.silverpeas.looks.aurora;
 
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.silverpeas.components.almanach.AlmanachSettings;
 import org.silverpeas.components.delegatednews.model.DelegatedNews;
@@ -21,6 +22,8 @@
 import org.silverpeas.core.admin.component.model.PersonalComponentInstance;
 import org.silverpeas.core.admin.component.model.SilverpeasComponentInstance;
 import org.silverpeas.core.admin.domain.model.Domain;
+import org.silverpeas.core.admin.service.AdminException;
+import org.silverpeas.core.admin.service.Administration;
 import org.silverpeas.core.admin.service.OrganizationController;
 import org.silverpeas.core.admin.space.SpaceInstLight;
 import org.silverpeas.core.admin.user.model.Group;
@@ -285,6 +288,17 @@ public List<ComponentInst> getApplications() {
   public List<PublicationDetail> getLatestPublications(String spaceId, int nbPublis) {
     String[] excludedComponentIds =
         StringUtils.split(getSettings("home.publications.components.excluded", ""));
+    String[] excludedSpaceIds =
+        StringUtils.split(getSettings("home.publications.spaces.excluded", ""));
+    for (String excludedSpaceId : excludedSpaceIds) {
+      try {
+        String [] excludedAppId = Administration.get().getAllComponentIdsRecur(excludedSpaceId);
+        excludedComponentIds = ArrayUtils.addAll(excludedComponentIds, excludedAppId);
+      } catch (AdminException e) {
+        SilverLogger.getLogger(this).error(e);
+      }
+    }
+
     List<PublicationDetail> publications =
         super.getLatestPublications(spaceId, Arrays.asList(excludedComponentIds), nbPublis * 2);
     List<PublicationDetail> result = new ArrayList<>();