all owners are treated as equal
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b062491b Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b062491b Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b062491b Branch: refs/heads/develop Commit: b062491b093f07109cd89b6dbaeb751cdc9a27db Parents: d8c4f45 Author: scnakandala <supun.nakand...@gmail.com> Authored: Fri Jul 7 12:08:00 2017 -0400 Committer: scnakandala <supun.nakand...@gmail.com> Committed: Fri Jul 7 12:08:00 2017 -0400 ---------------------------------------------------------------------- .../sharing/registry/db/repositories/UserRepository.java | 8 +++++--- .../registry/server/SharingRegistryServerHandler.java | 10 +++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/b062491b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java index a70166d..ee1f9b9 100644 --- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java +++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/db/repositories/UserRepository.java @@ -48,9 +48,11 @@ public class UserRepository extends AbstractRepository<User, UserEntity, UserPK> query += "u." + DBConstants.UserTable.DOMAIN_ID + " = '" + domainId + "' AND "; query += "s." + DBConstants.SharingTable.ENTITY_ID + " = '" + entityId + "' AND "; query += "s." + DBConstants.SharingTable.PERMISSION_TYPE_ID + " = '" + permissionTypeId + "'"; - if(permissionTypeId.equals((new PermissionTypeRepository()).getOwnerPermissionTypeIdForDomain(domainId))){ - query += "AND s." + DBConstants.SharingTable.SHARING_TYPE + " LIKE 'DIRECT_%'"; - } + +// if(permissionTypeId.equals((new PermissionTypeRepository()).getOwnerPermissionTypeIdForDomain(domainId))){ +// query += "AND s." + DBConstants.SharingTable.SHARING_TYPE + " LIKE 'DIRECT_%'"; +// } + query += " ORDER BY s.createdTime DESC"; return select(query, 0, -1); } http://git-wip-us.apache.org/repos/asf/airavata/blob/b062491b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java ---------------------------------------------------------------------- diff --git a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java index 8a40c11..819ec04 100644 --- a/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java +++ b/modules/sharing-registry/sharing-registry-server/src/main/java/org/apache/airavata/sharing/registry/server/SharingRegistryServerHandler.java @@ -827,12 +827,16 @@ public class SharingRegistryServerHandler implements SharingRegistryService.Ifac } /** - * * Sharing Entity with Users and Groups + * Sharing Entity with Users and Groups * * - * + * @param domainId * @param entityId * @param userList - * @param permissionType + * @param permissionTypeId + * @param cascadePermission + * @return + * @throws SharingRegistryException + * @throws TException */ @Override public boolean shareEntityWithUsers(String domainId, String entityId, List<String> userList, String permissionTypeId, boolean cascadePermission) throws SharingRegistryException, TException {
