Skip to content

Commit

Permalink
#315 remove old user-profile submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
michael-conway committed Sep 25, 2018
1 parent 41d0530 commit 88388d1
Show file tree
Hide file tree
Showing 19 changed files with 17 additions and 2,464 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,7 @@ Note that the following bug and feature requests are logged in GitHub with relat

The collection listing utilities have an ability to 'guess' through the top directories when StrictACLs are turned on. This was masking otherwise visible paths under 'home' when turned on. This
is corrected to better reflect the available directories under 'home'

#### Remove user profile subproject and migrate over to jargon-extensions #315

Remove user-profile submodule as old idrop-web legacy, this functionality is being revised and added to jargon-extensions-if for the purposes of standardizing MetaLnx
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,17 @@ public void setCollectionId(final int collectionId) {
this.collectionId = collectionId;
}

/**
* Handy method to check if inherit permissions are set
*
* @return {@code boolean} of {@code true} if inheritance is set on the
* collection. NB that the {@code getCollectionInheritance} will return
* a raw "1" in the string value. This method is for convenience.
*/
public boolean inheritanceSet() {
return collectionInheritance.equals("1");
}

public String getCollectionName() {
return collectionName;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1343,6 +1343,7 @@ public void findByAbsolutePath() throws Exception {
collFile.mkdirs();

CollectionAO collectionAO = accessObjectFactory.getCollectionAO(irodsAccount);
collectionAO.setAccessPermissionInherit("", collFile.getAbsolutePath(), false);
Collection collection = collectionAO.findByAbsolutePath(targetIrodsCollection);

Assert.assertNotNull("did not find the collection, was null", collection);
Expand All @@ -1351,6 +1352,7 @@ public void findByAbsolutePath() throws Exception {
collection.getCollectionName());
Assert.assertEquals("collection Name should be same as requested path", targetIrodsCollection,
collection.getCollectionName());
Assert.assertTrue("inheritance should be true", collection.inheritanceSet());
Assert.assertFalse("is set as a proxy", collection.isProxy());

}
Expand Down
4 changes: 0 additions & 4 deletions jargon-user-profile/README.TXT

This file was deleted.

134 changes: 0 additions & 134 deletions jargon-user-profile/pom.xml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 88388d1

Please sign in to comment.