Merge Space Templates - Meeds-io/MIPs#150 (#354)

Meeds-io · Nov 4, 2024 · ca702a2 · ca702a2
2 parents 968e5dd + f7b0ea4
commit ca702a2
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 9 deletions.
diff --git a/perk-store-services/src/main/java/org/exoplatform/perkstore/service/utils/Utils.java b/perk-store-services/src/main/java/org/exoplatform/perkstore/service/utils/Utils.java
@@ -259,12 +259,6 @@ public static Space getSpace(String id) {
       space = spaceService.getSpaceByPrettyName(id);
       if (space == null) {
         space = spaceService.getSpaceByGroupId("/spaces/" + id);
-        if (space == null) {
-          space = spaceService.getSpaceByDisplayName(id);
-          if (space == null) {
-            space = spaceService.getSpaceByUrl(id);
-          }
-        }
       }
     }
     return space;

diff --git a/...store-services/src/test/java/org/exoplatform/perkstore/test/mock/IdentityManagerMock.java b/...store-services/src/test/java/org/exoplatform/perkstore/test/mock/IdentityManagerMock.java
@@ -21,7 +21,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.codec.binary.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import org.exoplatform.commons.utils.ListAccess;
 import org.exoplatform.social.core.identity.IdentityProvider;

diff --git a/perk-store-services/src/test/java/org/exoplatform/perkstore/test/mock/SpaceServiceMock.java b/perk-store-services/src/test/java/org/exoplatform/perkstore/test/mock/SpaceServiceMock.java
@@ -22,7 +22,6 @@
 import org.exoplatform.services.security.MembershipEntry;
 import org.exoplatform.social.core.application.PortletPreferenceRequiredPlugin;
 import org.exoplatform.social.core.identity.model.Identity;
-import org.exoplatform.social.core.space.SpaceApplicationConfigPlugin;
 import org.exoplatform.social.core.space.SpaceException;
 import org.exoplatform.social.core.space.SpaceFilter;
 import org.exoplatform.social.core.space.SpaceListAccess;

diff --git a/perk-store-webapps/src/main/webapp/WEB-INF/gatein-resources.xml b/perk-store-webapps/src/main/webapp/WEB-INF/gatein-resources.xml
@@ -33,7 +33,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   </portlet-skin>
 
   <portlet-skin>
-    <application-name>social-portlet</application-name>
+    <application-name>social</application-name>
     <portlet-name>Search</portlet-name>
     <skin-name>Enterprise</skin-name>
     <additional-module>perkstore</additional-module>