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 2017/07/11 08:04:03 UTC
[2/2] syncope git commit: [SYNCOPE-1150] Properly handling of
propagation tasks' labels for Realms
[SYNCOPE-1150] Properly handling of propagation tasks' labels for Realms
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/bd5c1af8
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/bd5c1af8
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/bd5c1af8
Branch: refs/heads/master
Commit: bd5c1af88ab99432577cfa826b2a3ea6dc655418
Parents: 9779e13
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Jul 11 10:03:37 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Jul 11 10:03:51 2017 +0200
----------------------------------------------------------------------
.../client/console/panels/ConnObjects.java | 12 ++++-----
.../tasks/PropagationTaskDirectoryPanel.java | 27 ++++++++++++++------
.../console/tasks/TaskDirectoryPanel.java | 2 +-
.../console/topology/TopologyTogglePanel.java | 10 +++++---
.../PropagationTaskDirectoryPanel.properties | 2 +-
.../PropagationTaskDirectoryPanel_it.properties | 2 +-
...opagationTaskDirectoryPanel_pt_BR.properties | 2 +-
.../PropagationTaskDirectoryPanel_ru.properties | 2 +-
8 files changed, 35 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/bd5c1af8/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java
index 14a2b9c..595ff5a 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.Transformer;
import org.apache.syncope.client.console.commons.Constants;
-import org.apache.syncope.client.console.rest.ResourceRestClient;
import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
import org.apache.syncope.client.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
import org.apache.syncope.common.lib.SyncopeConstants;
@@ -46,11 +45,10 @@ public class ConnObjects extends Panel implements ModalPanel {
private final MultilevelPanel connObjects;
- public ConnObjects(final String resource, final PageReference pageRef) {
+ public ConnObjects(final ResourceTO resource, final PageReference pageRef) {
super(BaseModal.CONTENT_ID);
- ResourceTO resourceTO = new ResourceRestClient().read(resource);
- List<String> availableAnyTypes = CollectionUtils.collect(resourceTO.getProvisions(),
+ List<String> availableAnyTypes = CollectionUtils.collect(resource.getProvisions(),
new Transformer<ProvisionTO, String>() {
@Override
@@ -58,7 +56,7 @@ public class ConnObjects extends Panel implements ModalPanel {
return provision.getAnyType();
}
}, new ArrayList<String>());
- if (resourceTO.getOrgUnit() != null) {
+ if (resource.getOrgUnit() != null) {
availableAnyTypes.add(SyncopeConstants.REALM_ANYTYPE);
}
@@ -89,7 +87,7 @@ public class ConnObjects extends Panel implements ModalPanel {
};
connObjects.setFirstLevel(new NextableConnObjectDirectoryPanel(
- connObjects, resource, anyTypes.getField().getModelObject(), pageRef));
+ connObjects, resource.getKey(), anyTypes.getField().getModelObject(), pageRef));
connObjects.setOutputMarkupId(true);
add(connObjects);
@@ -100,7 +98,7 @@ public class ConnObjects extends Panel implements ModalPanel {
@Override
protected void onUpdate(final AjaxRequestTarget target) {
connObjects.setFirstLevel(new NextableConnObjectDirectoryPanel(
- connObjects, resource, anyTypes.getField().getModelObject(), pageRef));
+ connObjects, resource.getKey(), anyTypes.getField().getModelObject(), pageRef));
target.add(connObjects);
}
});
http://git-wip-us.apache.org/repos/asf/syncope/blob/bd5c1af8/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
index 1c653d0..614ebe3 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
@@ -40,16 +40,15 @@ import org.apache.syncope.common.lib.to.PropagationTaskTO;
import org.apache.syncope.common.lib.types.StandardEntitlement;
import org.apache.syncope.common.lib.types.TaskType;
import org.apache.syncope.common.lib.SyncopeClientException;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.model.StringResourceModel;
-/**
- * Tasks page.
- */
public abstract class PropagationTaskDirectoryPanel
extends TaskDirectoryPanel<PropagationTaskTO> implements ModalPanel {
@@ -74,15 +73,27 @@ public abstract class PropagationTaskDirectoryPanel
columns.add(new KeyPropertyColumn<PropagationTaskTO>(
new StringResourceModel("key", this), "key"));
- columns.add(new PropertyColumn<PropagationTaskTO, String>(new StringResourceModel(
- "operation", this), "operation", "operation"));
+ columns.add(new PropertyColumn<PropagationTaskTO, String>(
+ new StringResourceModel("operation", this), "operation", "operation"));
if (resource == null) {
- columns.add(new PropertyColumn<PropagationTaskTO, String>(new StringResourceModel(
- "resource", this), "resource", "resource"));
+ columns.add(new PropertyColumn<PropagationTaskTO, String>(
+ new StringResourceModel("resource", this), "resource", "resource"));
} else {
columns.add(new PropertyColumn<PropagationTaskTO, String>(
- new StringResourceModel("anyTypeKind", this), "anyTypeKind", "anyTypeKind"));
+ new StringResourceModel("anyTypeKind", this), "anyTypeKind", "anyTypeKind") {
+
+ private static final long serialVersionUID = 3344577098912281394L;
+
+ @Override
+ public IModel<?> getDataModel(final IModel<PropagationTaskTO> rowModel) {
+ if (rowModel.getObject().getAnyTypeKind() == null) {
+ return Model.of(SyncopeConstants.REALM_ANYTYPE);
+ } else {
+ return super.getDataModel(rowModel);
+ }
+ }
+ });
}
columns.add(new PropertyColumn<PropagationTaskTO, String>(
http://git-wip-us.apache.org/repos/asf/syncope/blob/bd5c1af8/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskDirectoryPanel.java
index b7ffabd..956afd6 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskDirectoryPanel.java
@@ -37,7 +37,7 @@ import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
/**
- * Tasks page.
+ * Tasks {@link DirectoryPanel}.
*
* @param <T> task type.
*/
http://git-wip-us.apache.org/repos/asf/syncope/blob/bd5c1af8/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java
index cf75204..520bf1a 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/topology/TopologyTogglePanel.java
@@ -413,12 +413,12 @@ public class TopologyTogglePanel extends TogglePanel<Serializable> {
@Override
public void onClick(final AjaxRequestTarget target) {
- ResourceTO modelObject = resourceRestClient.read(node.getKey());
+ ResourceTO resource = resourceRestClient.read(node.getKey());
- IModel<ResourceTO> model = new CompoundPropertyModel<>(modelObject);
+ IModel<ResourceTO> model = new CompoundPropertyModel<>(resource);
provisionModal.setFormModel(model);
- target.add(provisionModal.setContent(new ResourceProvisionPanel(provisionModal, modelObject, pageRef)));
+ target.add(provisionModal.setContent(new ResourceProvisionPanel(provisionModal, resource, pageRef)));
provisionModal.header(new Model<>(MessageFormat.format(getString("resource.edit"), node.getKey())));
@@ -443,7 +443,9 @@ public class TopologyTogglePanel extends TogglePanel<Serializable> {
@Override
public void onClick(final AjaxRequestTarget target) {
- target.add(propTaskModal.setContent(new ConnObjects(node.getKey(), pageRef)));
+ ResourceTO resource = resourceRestClient.read(node.getKey());
+
+ target.add(propTaskModal.setContent(new ConnObjects(resource, pageRef)));
propTaskModal.header(new StringResourceModel("resource.explore.list", Model.of(node)));
propTaskModal.show(true);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/bd5c1af8/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.properties
index 32c785a..d06158d 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.properties
@@ -18,5 +18,5 @@ operation=Operation
anyTypeKind=Object Type
entityKey=Local ID
connObjectKey=Remote ID
-task.view=${right.operation} task about ${right.anyTypeKind}
+task.view=${right.operation} ${right.objectClassName}
resource=Resource
http://git-wip-us.apache.org/repos/asf/syncope/blob/bd5c1af8/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_it.properties
index 91e61fe..71a1e85 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_it.properties
@@ -18,5 +18,5 @@ operation=Operazione
anyTypeKind=Tipo Oggetto
entityKey=ID Locale
connObjectKey=ID Remoto
-task.view=${right.operation} task per ${right.anyTypeKind}
+task.view=${right.operation} ${right.objectClassName}
resource=risorsa
http://git-wip-us.apache.org/repos/asf/syncope/blob/bd5c1af8/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_pt_BR.properties
index cb14e4b..4e2efd0 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_pt_BR.properties
@@ -18,5 +18,5 @@ operation=Operation
anyTypeKind=Object Type
entityKey=Local ID
connObjectKey=Remote ID
-task.view=${right.operation} task about ${right.anyTypeKind}
+task.view=${right.operation} ${right.objectClassName}
resource=Recurso
http://git-wip-us.apache.org/repos/asf/syncope/blob/bd5c1af8/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_ru.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_ru.properties
index 7a5fe3d..593eb12 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_ru.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel_ru.properties
@@ -19,5 +19,5 @@ operation=\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435
anyTypeKind=\u041e\u0431\u044a\u0435\u043a\u0442
entityKey=\u041b\u043e\u043a\u0430\u043b\u044c\u043d\u044b\u0439 \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440
connObjectKey=\u0418\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440 \u0432 \u0440\u0435\u0441\u0443\u0440\u0441\u0435
-task.view=\u0417\u0430\u0434\u0430\u0447\u0430 ${right.operation} \u0434\u043b\u044f ${right.anyTypeKind}
+task.view=${right.operation} ${right.objectClassName}
resource=Pecypce