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 2019/12/18 08:53:28 UTC
[syncope] branch 2_1_X updated: Small fix
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 961e5d8 Small fix
961e5d8 is described below
commit 961e5d816992b438a02021a97b17ec0a55758e1d
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Wed Dec 18 09:53:16 2019 +0100
Small fix
---
.../org/apache/syncope/client/console/pages/Dashboard_fr_CA.properties | 2 +-
.../org/apache/syncope/core/persistence/jpa/dao/JPAPlainSchemaDAO.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Dashboard_fr_CA.properties b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Dashboard_fr_CA.properties
index 35b2865..17fd01b 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/pages/Dashboard_fr_CA.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/pages/Dashboard_fr_CA.properties
@@ -16,4 +16,4 @@
# under the License.
overview=R�sum�
control=Contr�le
-accessTokens=Acc�der aux jetons
+accessTokens=Jetons d'acc�s
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAPlainSchemaDAO.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAPlainSchemaDAO.java
index 95318f4..066f938 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAPlainSchemaDAO.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/JPAPlainSchemaDAO.java
@@ -37,6 +37,7 @@ import org.apache.syncope.core.persistence.api.entity.conf.CPlainAttr;
import org.apache.syncope.core.persistence.api.entity.group.GPlainAttr;
import org.apache.syncope.core.persistence.jpa.entity.JPAPlainSchema;
import org.apache.syncope.core.persistence.jpa.entity.anyobject.JPAAPlainAttr;
+import org.apache.syncope.core.persistence.jpa.entity.conf.JPACPlainAttr;
import org.apache.syncope.core.persistence.jpa.entity.group.JPAGPlainAttr;
import org.apache.syncope.core.persistence.jpa.entity.user.JPAUPlainAttr;
import org.springframework.beans.factory.annotation.Autowired;
@@ -163,7 +164,7 @@ public class JPAPlainSchemaDAO extends AbstractDAO<PlainSchema> implements Plain
return JPAAPlainAttr.TABLE;
}
if (CPlainAttr.class.isAssignableFrom(plainAttrClass)) {
- return JPAAPlainAttr.TABLE;
+ return JPACPlainAttr.TABLE;
}
return JPAUPlainAttr.TABLE;
}