You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2022/04/06 08:49:10 UTC
[syncope] branch 2_1_X updated: [SYNCOPE-1671] Fix italian label and add support to sort tasks by job delegate
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new e523a662da [SYNCOPE-1671] Fix italian label and add support to sort tasks by job delegate
e523a662da is described below
commit e523a662dae2b1defe479edcdac87e1136ab4f35
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Wed Apr 6 10:45:30 2022 +0200
[SYNCOPE-1671] Fix italian label and add support to sort tasks by job delegate
---
.../client/console/tasks/SchedTaskDirectoryPanel_it.properties | 2 +-
.../java/org/apache/syncope/core/persistence/jpa/dao/JPATaskDAO.java | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel_it.properties
index c9183f5908..f261aec1b2 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/SchedTaskDirectoryPanel_it.properties
@@ -17,7 +17,7 @@
name=Nome
description=Descrizione
destinationRealm=Realm di destinazione
-jobDelegate=JobJob Delegate
+jobDelegate=Job Delegate
lastExec=Ultima esecuzione
nextExec=Prossima esecuzione
active=Attivo
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPATaskDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPATaskDAO.java
index c96b66632d..eda15e7f9a 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPATaskDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPATaskDAO.java
@@ -27,6 +27,7 @@ import java.util.stream.Collectors;
import javax.persistence.DiscriminatorValue;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
import javax.persistence.Query;
import javax.persistence.TypedQuery;
import org.apache.commons.lang3.StringUtils;
@@ -341,7 +342,9 @@ public class JPATaskDAO extends AbstractDAO<Task> implements TaskDAO {
Field beanField = ReflectionUtils.findField(beanClass, field);
if (beanField != null
&& (beanField.getAnnotation(ManyToOne.class) != null
- || beanField.getAnnotation(OneToMany.class) != null)) {
+ || beanField.getAnnotation(OneToMany.class) != null
+ || beanField.getAnnotation(OneToOne.class) != null)) {
+
field += "_id";
}
}