From 8d99c88af55041ff06e6b9372b6b1f66220bed38 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Mon, 10 Apr 2017 16:08:58 +0000
Subject: [PATCH] #3529 feature - Added applications to user profile and upgrade to angular4
---
securis/src/main/java/net/curisit/securis/services/PackResource.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/securis/src/main/java/net/curisit/securis/services/PackResource.java b/securis/src/main/java/net/curisit/securis/services/PackResource.java
index a417a98..07bfdfa 100644
--- a/securis/src/main/java/net/curisit/securis/services/PackResource.java
+++ b/securis/src/main/java/net/curisit/securis/services/PackResource.java
@@ -90,11 +90,14 @@
LOG.info("Getting all packs for user: " + bsc.getUserPrincipal());
q = em.createNamedQuery("list-packs", Pack.class);
} else {
- if (bsc.getOrganizationsIds() == null) {
+ if (bsc.getOrganizationsIds() == null || bsc.getOrganizationsIds().isEmpty() || //
+ bsc.getApplicationsIds() == null || bsc.getApplicationsIds().isEmpty()) {
return Response.ok().build();
}
- q = em.createNamedQuery("list-packs-by-orgs", Pack.class);
- q.setParameter("list_ids", bsc.getOrganizationsIds());
+ q = em.createNamedQuery("list-packs-by-orgs-apps", Pack.class);
+ q.setParameter("list_ids_org", bsc.getOrganizationsIds());
+ q.setParameter("list_ids_app", bsc.getApplicationsIds());
+ LOG.info("Getting packs from orgs: {} and apps: {}", bsc.getOrganizationsIds(), bsc.getApplicationsIds());
}
List<Pack> list = q.getResultList();
--
Gitblit v1.3.2