Skip to content

Commit 18a9205

Browse files
author
svuillet
committed
Feature #12629
1 parent 039458c commit 18a9205

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

aurora/aurora-configuration/src/main/config/properties/org/silverpeas/util/viewGenerator/settings/Aurora.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ home.search.extrafield.space = false
214214
home.publications.nb = 3
215215
home.publications.spaceid =
216216
home.publications.components.excluded =
217+
home.publications.spaces.excluded =
217218

218219
# Turn this to false to display first main space as homepage only if regular user has access to no news
219220
home.displayedWhenNoNews = true

aurora/aurora-war/src/main/java/org/silverpeas/looks/aurora/LookAuroraHelper.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package org.silverpeas.looks.aurora;
22

3+
import org.apache.commons.lang3.ArrayUtils;
34
import org.apache.commons.lang3.StringUtils;
45
import org.silverpeas.components.almanach.AlmanachSettings;
56
import org.silverpeas.components.delegatednews.model.DelegatedNews;
@@ -21,6 +22,8 @@
2122
import org.silverpeas.core.admin.component.model.PersonalComponentInstance;
2223
import org.silverpeas.core.admin.component.model.SilverpeasComponentInstance;
2324
import org.silverpeas.core.admin.domain.model.Domain;
25+
import org.silverpeas.core.admin.service.AdminException;
26+
import org.silverpeas.core.admin.service.Administration;
2427
import org.silverpeas.core.admin.service.OrganizationController;
2528
import org.silverpeas.core.admin.space.SpaceInstLight;
2629
import org.silverpeas.core.admin.user.model.Group;
@@ -285,6 +288,17 @@ public List<ComponentInst> getApplications() {
285288
public List<PublicationDetail> getLatestPublications(String spaceId, int nbPublis) {
286289
String[] excludedComponentIds =
287290
StringUtils.split(getSettings("home.publications.components.excluded", ""));
291+
String[] excludedSpaceIds =
292+
StringUtils.split(getSettings("home.publications.spaces.excluded", ""));
293+
for (String excludedSpaceId : excludedSpaceIds) {
294+
try {
295+
String [] excludedAppId = Administration.get().getAllComponentIdsRecur(excludedSpaceId);
296+
excludedComponentIds = ArrayUtils.addAll(excludedComponentIds, excludedAppId);
297+
} catch (AdminException e) {
298+
SilverLogger.getLogger(this).error(e);
299+
}
300+
}
301+
288302
List<PublicationDetail> publications =
289303
super.getLatestPublications(spaceId, Arrays.asList(excludedComponentIds), nbPublis * 2);
290304
List<PublicationDetail> result = new ArrayList<>();

0 commit comments

Comments
 (0)