[CONF] Apache Syncope [DISCUSS] Domains
Francesco Chicchiricco moved the page: [DISCUSS] Domains From: Apache Syncope Jazz To: Apache Syncope Roadmap View Online Like Add Comment Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
[CONF] Apache Syncope [DISCUSS] Any objects
Francesco Chicchiricco added a file to the page [DISCUSS] Any objects SYNCOPE-666.png - 47 kB PNG File View Attachments Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
[CONF] Apache Syncope [DISCUSS] Any objects
Francesco Chicchiricco added a file to the page [DISCUSS] Any objects SYNCOPE-666.png - 45 kB PNG File View Attachments Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
[CONF] Apache Syncope [DISCUSS] Code re-organization
Francesco Chicchiricco moved the page: [DISCUSS] Code re-organization From: Apache Syncope Jazz To: Apache Syncope Roadmap View Online Like Add Comment Stop watching space Manage Notifications This message was sent by Atlassian Confluence 5.0.3, Team Collaboration Software
syncope git commit: [SYNCOPE-669] Search filter in the notifications
Repository: syncope
Updated Branches:
refs/heads/1_2_X 1d6451b5c - b68778e34
[SYNCOPE-669] Search filter in the notifications
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b68778e3
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b68778e3
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b68778e3
Branch: refs/heads/1_2_X
Commit: b68778e3482ac4cfae2d897d8c56333ef4fe
Parents: 1d6451b
Author: Marco Di Sabatino Di Diodoro mdisabat...@apache.org
Authored: Thu May 21 17:06:00 2015 +0200
Committer: Marco Di Sabatino Di Diodoro mdisabat...@apache.org
Committed: Thu May 21 17:06:00 2015 +0200
--
.../apache/syncope/core/notification/NotificationManager.java | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/b68778e3/core/src/main/java/org/apache/syncope/core/notification/NotificationManager.java
--
diff --git
a/core/src/main/java/org/apache/syncope/core/notification/NotificationManager.java
b/core/src/main/java/org/apache/syncope/core/notification/NotificationManager.java
index 63b54ec..341a0bd 100644
---
a/core/src/main/java/org/apache/syncope/core/notification/NotificationManager.java
+++
b/core/src/main/java/org/apache/syncope/core/notification/NotificationManager.java
@@ -303,11 +303,12 @@ public class NotificationManager {
if (events.isEmpty()) {
LOG.debug(No events found about {}, subject);
} else if (subjectType == null || subject == null
-|| notification.getUserAbout() == null ||
notification.getRoleAbout() == null
+|| (subjectType == SubjectType.USER
(notification.getUserAbout() == null
|| searchDAO.matches(subject,
-
SearchCondConverter.convert(notification.getUserAbout()), subjectType)
+
SearchCondConverter.convert(notification.getUserAbout()), subjectType)))
+|| subjectType == SubjectType.ROLE
(notification.getRoleAbout() == null
|| searchDAO.matches(subject,
-
SearchCondConverter.convert(notification.getRoleAbout()), subjectType)) {
+
SearchCondConverter.convert(notification.getRoleAbout()), subjectType))) {
LOG.debug(Creating notification task for events {} about
{}, events, subject);
[1/2] syncope git commit: [SYNCOPE-669] Search filter in the notifications
Repository: syncope
Updated Branches:
refs/heads/master eb99e243b - d19133ef5
[SYNCOPE-669] Search filter in the notifications
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b68778e3
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b68778e3
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b68778e3
Branch: refs/heads/master
Commit: b68778e3482ac4cfae2d897d8c56333ef4fe
Parents: 1d6451b
Author: Marco Di Sabatino Di Diodoro mdisabat...@apache.org
Authored: Thu May 21 17:06:00 2015 +0200
Committer: Marco Di Sabatino Di Diodoro mdisabat...@apache.org
Committed: Thu May 21 17:06:00 2015 +0200
--
.../apache/syncope/core/notification/NotificationManager.java | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/b68778e3/core/src/main/java/org/apache/syncope/core/notification/NotificationManager.java
--
diff --git
a/core/src/main/java/org/apache/syncope/core/notification/NotificationManager.java
b/core/src/main/java/org/apache/syncope/core/notification/NotificationManager.java
index 63b54ec..341a0bd 100644
---
a/core/src/main/java/org/apache/syncope/core/notification/NotificationManager.java
+++
b/core/src/main/java/org/apache/syncope/core/notification/NotificationManager.java
@@ -303,11 +303,12 @@ public class NotificationManager {
if (events.isEmpty()) {
LOG.debug(No events found about {}, subject);
} else if (subjectType == null || subject == null
-|| notification.getUserAbout() == null ||
notification.getRoleAbout() == null
+|| (subjectType == SubjectType.USER
(notification.getUserAbout() == null
|| searchDAO.matches(subject,
-
SearchCondConverter.convert(notification.getUserAbout()), subjectType)
+
SearchCondConverter.convert(notification.getUserAbout()), subjectType)))
+|| subjectType == SubjectType.ROLE
(notification.getRoleAbout() == null
|| searchDAO.matches(subject,
-
SearchCondConverter.convert(notification.getRoleAbout()), subjectType)) {
+
SearchCondConverter.convert(notification.getRoleAbout()), subjectType))) {
LOG.debug(Creating notification task for events {} about
{}, events, subject);
