diff --git a/src/main/java/eu/sshopencloud/marketplace/services/items/ItemVisibilityService.java b/src/main/java/eu/sshopencloud/marketplace/services/items/ItemVisibilityService.java index ec34d57a572356a57351a9f50681ef381d24488f..50e5ebae73be58a057f400e50c971e3774d806d3 100644 --- a/src/main/java/eu/sshopencloud/marketplace/services/items/ItemVisibilityService.java +++ b/src/main/java/eu/sshopencloud/marketplace/services/items/ItemVisibilityService.java @@ -74,12 +74,10 @@ class ItemVisibilityService { public boolean shouldSeeItem(Item item, User user) { if (item.getStatus().equals(ItemStatus.DEPRECATED)) return false; - - System.out.println("Eliza " + hasAccessToVersion(item, user)); return hasAccessToVersion(item, user); } - //Eliza + public boolean hasAccessToVersion(Item version, User user) { ItemStatus itemStatus = version.getStatus(); diff --git a/src/main/java/eu/sshopencloud/marketplace/services/items/ItemsComparator.java b/src/main/java/eu/sshopencloud/marketplace/services/items/ItemsComparator.java index 3a8529fcf3e69e18f63cc4e1a8df6ae6fde7c3fb..9408470286db6c2fdde4251587a79dde608acdf2 100644 --- a/src/main/java/eu/sshopencloud/marketplace/services/items/ItemsComparator.java +++ b/src/main/java/eu/sshopencloud/marketplace/services/items/ItemsComparator.java @@ -596,7 +596,6 @@ public class ItemsComparator { } } - //Eliza public ItemsDifferencesDto differentiateComposedOf(WorkflowDto item, WorkflowDto other, ItemsDifferencesDto differences) { int itemSize = item.getComposedOf() != null ? item.getComposedOf().size() : 0; @@ -614,6 +613,8 @@ public class ItemsComparator { differences.setEqual(false); } } + if (itemSize != otherSize) + differences.setEqual(false); } else { if (other.getComposedOf() != null) { differences.setEqual(false); diff --git a/src/main/java/eu/sshopencloud/marketplace/services/items/WorkflowService.java b/src/main/java/eu/sshopencloud/marketplace/services/items/WorkflowService.java index 1d81a4167b82a6f591938e60f1c48d04d42a43c4..ca47e0c3c92eafee9738a1de3e96f926ae191127 100644 --- a/src/main/java/eu/sshopencloud/marketplace/services/items/WorkflowService.java +++ b/src/main/java/eu/sshopencloud/marketplace/services/items/WorkflowService.java @@ -408,8 +408,6 @@ public class WorkflowService extends ItemCrudService