From f0ea301c4bf12851da7b6ce227e2c6ad2a4d3f19 Mon Sep 17 00:00:00 2001
From: Sonia Zorba <sonia.zorba@inaf.it>
Date: Tue, 28 Jan 2020 12:51:35 +0100
Subject: [PATCH] Fixed minor issue in search endpoint
---
gms-ui/src/components/Paginator.vue | 3 ---
.../controller/JWTWebServiceController.java | 26 ++++++++++---------
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/gms-ui/src/components/Paginator.vue b/gms-ui/src/components/Paginator.vue
index 988e340..b6ee2a0 100644
--- a/gms-ui/src/components/Paginator.vue
+++ b/gms-ui/src/components/Paginator.vue
@@ -29,9 +29,6 @@ export default {
onUpdate: Function,
paginatorInput: Object
},
- /*computed: mapState({
- input: state => state.input
- }),*/
data: function() {
return {
pageSizeOptions: [{
diff --git a/gms/src/main/java/it/inaf/ia2/gms/controller/JWTWebServiceController.java b/gms/src/main/java/it/inaf/ia2/gms/controller/JWTWebServiceController.java
index 7a56d7b..f400977 100644
--- a/gms/src/main/java/it/inaf/ia2/gms/controller/JWTWebServiceController.java
+++ b/gms/src/main/java/it/inaf/ia2/gms/controller/JWTWebServiceController.java
@@ -79,23 +79,25 @@ public class JWTWebServiceController {
List<String> groupNames = extractGroupNames(group);
- boolean isMemeber = false;
- String parentPath = ""; // starting from ROOT
- for (String groupName : groupNames) {
- Optional<GroupEntity> optionalGroup = groupsDAO.findGroupByParentAndName(parentPath, groupName);
- if (optionalGroup.isPresent()) {
- GroupEntity groupEntity = optionalGroup.get();
- parentPath = groupEntity.getPath();
- isMemeber = membershipsDAO.isMemberOf(userId, groupEntity.getId());
- if (isMemeber) {
+ boolean isMember = membershipsDAO.isMemberOf(userId, "ROOT");
+ if (!isMember) {
+ String parentPath = ""; // starting from ROOT
+ for (String groupName : groupNames) {
+ Optional<GroupEntity> optionalGroup = groupsDAO.findGroupByParentAndName(parentPath, groupName);
+ if (optionalGroup.isPresent()) {
+ GroupEntity groupEntity = optionalGroup.get();
+ parentPath = groupEntity.getPath();
+ isMember = membershipsDAO.isMemberOf(userId, groupEntity.getId());
+ if (isMember) {
+ break;
+ }
+ } else {
break;
}
- } else {
- break;
}
}
- if (isMemeber) {
+ if (isMember) {
try (PrintWriter pw = new PrintWriter(response.getOutputStream())) {
pw.println(group);
}
--
GitLab