airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [08/50] [abbrv] airavata git commit: all owners are treated as equal
Date Thu, 03 Aug 2017 16:01:24 GMT
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/7af20472
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/7af20472
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/7af20472

Branch: refs/heads/master
Commit: 7af20472a36cceb1a8d8696e3caad8d0ef2973f2
Parents: a0c6b89
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Fri Jul 7 12:09:52 2017 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Fri Jul 7 12:09:52 2017 -0400

----------------------------------------------------------------------
 .../sharing/registry/db/repositories/UserRepository.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/7af20472/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);
     }


Mime
View raw message