Changeset 5939 for ComponentRegistry

Timestamp:

01/21/15 16:11:53 (9 years ago)

Author:

Twan Goosen

Message:

merged some fixes from trunk

Location:

ComponentRegistry/branches/ComponentRegistry-2.0

Files:

• . (modified) (1 prop)
• ComponentRegistry (modified) (1 prop)
• ComponentRegistry/src/main/java (modified) (1 prop)
• ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java (modified) (1 diff)
• ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/MDValidator.java (modified) (2 diffs)

ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/ComponentRegistryRestService.java

@@ -691 +691 @@
             Principal principal = checkAndGetUserPrincipal();
             ComponentRegistry registry = this.getBaseRegistry();
+            registry.setRegistrySpace(RegistrySpace.PUBLISHED);
             ProfileDescription desc = registry.getProfileDescriptionAccessControlled(profileId);
             if (desc != null) {

ComponentRegistry/branches/ComponentRegistry-2.0/ComponentRegistry/src/main/java/clarin/cmdi/componentregistry/rest/MDValidator.java

@@ -170 +170 @@
                 };
                 // a private component for a private registry is available only if its owner is the owner of the resgitry
-                if (registry.getRegistrySpace().equals(RegistrySpace.PRIVATE)) {
+                if (RegistrySpace.PRIVATE.equals(registry.getRegistrySpace())) {
                     if(registry.canCurrentUserAccessDescription(componentId)) {
                         return;
@@ -178 +178 @@
 
                 } else { // a private component in a group registry is availabe only if it belongs to the group
-                    if (registry.getRegistrySpace().equals(RegistrySpace.GROUP)) {
+                    if (RegistrySpace.GROUP.equals(registry.getRegistrySpace())) {
                         if (registry.getGroupId() == null) {
                             errorMessages.add(COMPONENT_REGISTRY_EXCEPTION_ERROR + "in the group space, the group id is null");