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 2020/01/03 15:23:44 UTC
[syncope] branch 2_1_X updated: Fixing minor issues introduced by
latest changes
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 2cbae59 Fixing minor issues introduced by latest changes
2cbae59 is described below
commit 2cbae599d412514c25b930427270e226f87fa0e2
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Fri Jan 3 16:23:33 2020 +0100
Fixing minor issues introduced by latest changes
---
.../syncope/client/console/panels/AnyDirectoryPanel.java | 2 +-
.../console/wicket/markup/html/form/ActionsPanel.properties | 9 +++++----
.../wicket/markup/html/form/ActionsPanel_fr_CA.properties | 8 ++++----
.../wicket/markup/html/form/ActionsPanel_it.properties | 9 ++++++---
.../wicket/markup/html/form/ActionsPanel_ja.properties | 10 ++++++----
.../wicket/markup/html/form/ActionsPanel_pt_BR.properties | 7 ++++---
.../wicket/markup/html/form/ActionsPanel_ru.properties | 9 ++++++---
.../syncope/client/console/rest/BpmnProcessRestClient.java | 12 +++++++++---
8 files changed, 41 insertions(+), 25 deletions(-)
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java
index 60980dc..52db1cc 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyDirectoryPanel.java
@@ -259,7 +259,7 @@ public abstract class AnyDirectoryPanel<A extends AnyTO, E extends AbstractAnyRe
prefMan.getList(getRequest(), DisplayAttributesModalPanel.getPrefPlainAttributeView(type)).stream().
filter(name -> pSchemaNames.contains(name)).
- map(name -> prefcolumns.add(new AttrColumn<>(name, SchemaType.PLAIN)));
+ forEach(name -> prefcolumns.add(new AttrColumn<>(name, SchemaType.PLAIN)));
prefMan.getList(getRequest(), DisplayAttributesModalPanel.getPrefDerivedAttributeView(type)).stream().
filter(name -> (dSchemaNames.contains(name))).
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties
index b197829..af95e02 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties
@@ -273,10 +273,11 @@ manage_accounts.class=fa fa-users
manage_accounts.title=manage accounts
manage_accounts.alt=manage accounts icon
-workflow_modeler.class=fa fa-picture-o
-workflow_modeler.title=workflow modeler
-workflow_modeler.alt=workflow modeler icon
-
view_audit_history.class=fa fa-history
view_audit_history.title=manage history
view_audit_history.alt=manage history icon
+
+external_editor.title=external editor icon
+external_editor.class=fa fa-picture-o
+external_editor.alt=external editor icon
+
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_fr_CA.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_fr_CA.properties
index f2a3581..f1fbdbe 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_fr_CA.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_fr_CA.properties
@@ -209,9 +209,9 @@ zoom_out.alt=ic\u00f4ne zoom-out
manage_accounts.class=fa fa-users
manage_accounts.title=g\u00e9rer comptes
manage_accounts.alt=ic\u00f4ne g\u00e9rer groupes
-workflow_modeler.class=fa fa-picture-o
-workflow_modeler.title=mod\u00e9lisateur de workflow
-workflow_modeler.alt=ic\u00f4ne mod\u00e9lisateur de workflow
view_audit_history.title=manage history
view_audit_history.class=fa fa-history
-view_audit_history.alt=manage history icon
+view_audit_history.alt=manage history
+external_editor.title=external editor icon
+external_editor.class=fa fa-picture-o
+external_editor.alt=external editor icon
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties
index 0155d4f..c6e88ca 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties
@@ -257,9 +257,6 @@ zoom_in.alt=zoom-in icon
zoom_out.class=fa fa-search-minus
zoom_out.title=rimpicciolisci
zoom_out.alt=zoom-out icon
-workflow_modeler.class=fa fa-picture-o
-workflow_modeler.title=workflow modeler
-workflow_modeler.alt=workflow modeler icon
reconciliation_push.class=fa fa-chevron-circle-right
reconciliation_push.title=push
reconciliation_push.alt=reconciliation push icon
@@ -275,6 +272,12 @@ manage_accounts.alt=manage accounts icon
view_audit_history.class=fa fa-history
view_audit_history.title=storico modifiche
view_audit_history.alt=storico modifiche icon
+
unclaim.class=fa fa-undo
unclaim.alt=unclaim icon
unclaim.title=ritira
+
+external_editor.title=external editor icon
+external_editor.class=fa fa-picture-o
+external_editor.alt=external editor icon
+
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ja.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ja.properties
index 4f88ec0..4de5ebe 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ja.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ja.properties
@@ -258,10 +258,6 @@ zoom_out.class=fa fa-search-minus
zoom_out.title=\u30ba\u30fc\u30e0\u30a2\u30a6\u30c8
zoom_out.alt=\u30ba\u30fc\u30e0\u30a2\u30a6\u30c8
-workflow_modeler.class=fa fa-picture-o
-workflow_modeler.title=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u30e2\u30c7\u30e9\u2015
-workflow_modeler.alt=\u30ef\u30fc\u30af\u30d5\u30ed\u30fc\u30e2\u30c7\u30e9\u2015
-
reconciliation_push.class=fa fa-chevron-circle-right
reconciliation_push.title=\u30d7\u30c3\u30b7\u30e5
reconciliation_push.alt=\u7167\u5408\u30d7\u30c3\u30b7\u30e5 icon
@@ -277,6 +273,12 @@ manage_accounts.alt=\u30a2\u30ab\u30a6\u30f3\u30c8\u7ba1\u7406\u30a2\u30a4\u30b3
view_audit_history.class=fa fa-history
view_audit_history.title=manage history
view_audit_history.alt=manage history icon
+
unclaim.class=fa fa-undo
unclaim.alt=unclaim icon
unclaim.title=unclaim
+
+external_editor.title=external editor icon
+external_editor.class=fa fa-picture-o
+external_editor.alt=external editor icon
+
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_pt_BR.properties
index 0d2b609..9a4ffbf 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_pt_BR.properties
@@ -282,6 +282,7 @@ manage_accounts.alt=manage accounts icon
view_audit_history.class=fa fa-history
view_audit_history.title=manage history
view_audit_history.alt=manage history icon
-workflow_modeler.class=fa fa-picture-o
-workflow_modeler.title=workflow modeler icon
-workflow_modeler.alt=workflow modeler icon
+
+external_editor.title=external editor icon
+external_editor.class=fa fa-picture-o
+external_editor.alt=external editor icon
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ru.properties
index 146652e..365367e 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ru.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_ru.properties
@@ -257,9 +257,6 @@ zoom_in.alt=zoom-in icon
zoom_out.class=fa fa-search-minus
zoom_out.title=zoom-out
zoom_out.alt=zoom-out icon
-workflow_modeler.class=fa fa-picture-o
-workflow_modeler.title=workflow modeler
-workflow_modeler.alt=workflow modeler icon
reconciliation_push.class=fa fa-chevron-circle-right
reconciliation_push.title=push
@@ -276,6 +273,12 @@ manage_accounts.alt=manage accounts icon
view_audit_history.class=fa fa-history
view_audit_history.title=manage history
view_audit_history.alt=manage history icon
+
unclaim.class=fa fa-undo
unclaim.alt=unclaim icon
unclaim.title=unclaim
+
+external_editor.title=external editor icon
+external_editor.class=fa fa-picture-o
+external_editor.alt=external editor icon
+
diff --git a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/rest/BpmnProcessRestClient.java b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/rest/BpmnProcessRestClient.java
index 909107d..1e13185 100644
--- a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/rest/BpmnProcessRestClient.java
+++ b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/rest/BpmnProcessRestClient.java
@@ -19,12 +19,14 @@
package org.apache.syncope.client.console.rest;
import java.io.InputStream;
+import java.util.Collections;
import java.util.List;
+import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.cxf.helpers.IOUtils;
-import org.apache.cxf.jaxrs.client.Client;
import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.cxf.jaxrs.impl.MetadataMap;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.common.lib.to.BpmnProcess;
import org.apache.syncope.common.rest.api.RESTHeaders;
@@ -40,8 +42,12 @@ public class BpmnProcessRestClient extends BaseRestClient {
private BpmnProcessService getService(final MediaType mediaType) {
BpmnProcessService service = getService(BpmnProcessService.class);
- Client client = WebClient.client(service);
- client.type(mediaType);
+
+ MetadataMap<String, String> accept = new MetadataMap<>();
+ accept.put(HttpHeaders.CONTENT_TYPE, Collections.singletonList(mediaType.toString()));
+ accept.put(HttpHeaders.ACCEPT, Collections.singletonList(mediaType.toString()));
+ WebClient.client(service).headers(accept);
+
return service;
}