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 2016/07/20 14:58:13 UTC
[19/43] syncope git commit: [SYNCOPE-890] provides title on the
checkbox
[SYNCOPE-890] provides title on the checkbox
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3f120699
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3f120699
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3f120699
Branch: refs/heads/2_0_NO_JAXB
Commit: 3f1206993548090a3e7c46d2a117017fa3941989
Parents: 49b4f39
Author: fmartelli <fa...@gmail.com>
Authored: Fri Jul 8 17:37:57 2016 +0200
Committer: fmartelli <fa...@gmail.com>
Committed: Fri Jul 8 17:37:57 2016 +0200
----------------------------------------------------------------------
.../resources/ResourceProvisionPanel.java | 146 +++++++++----------
.../resources/ResourceProvisionPanel.properties | 1 +
.../ResourceProvisionPanel_it.properties | 1 +
.../ResourceProvisionPanel_pt_BR.properties | 1 +
.../ResourceProvisionPanel_ru.properties | 1 +
5 files changed, 77 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/3f120699/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java
index 28f0346..dd6c7de 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.java
@@ -64,7 +64,7 @@ public class ResourceProvisionPanel extends AbstractModalPanel<Serializable> {
private static final long serialVersionUID = -7982691107029848579L;
private final ConnectorRestClient connectorRestClient = new ConnectorRestClient();
-
+
private final ResourceTO resourceTO;
private Model<OrgUnitTO> baseModel;
@@ -98,6 +98,7 @@ public class ResourceProvisionPanel extends AbstractModalPanel<Serializable> {
Model.of(realmProvisionEnabled),
false);
aboutRealmProvison.add(enableRealmsProvision);
+ enableRealmsProvision.setIndex(1).setTitle(getString("enableRealmsProvision.title"));
final WebMarkupContainer realmsProvisionContainer = new WebMarkupContainer("realmsProvisionContainer");
realmsProvisionContainer.setOutputMarkupPlaceholderTag(true);
@@ -178,14 +179,14 @@ public class ResourceProvisionPanel extends AbstractModalPanel<Serializable> {
? null
: IteratorUtils.find(list.iterator(), new Predicate<ProvisionTO>() {
- @Override
- public boolean evaluate(final ProvisionTO in) {
- return ((item.getKey() == null && in.getKey() == null)
- || (in.getKey() != null && in.getKey().equals(item.getKey())))
- && ((item.getAnyType() == null && in.getAnyType() == null)
- || (in.getAnyType() != null && in.getAnyType().equals(item.getAnyType())));
- }
- });
+ @Override
+ public boolean evaluate(final ProvisionTO in) {
+ return ((item.getKey() == null && in.getKey() == null)
+ || (in.getKey() != null && in.getKey().equals(item.getKey())))
+ && ((item.getAnyType() == null && in.getAnyType() == null)
+ || (in.getAnyType() != null && in.getAnyType().equals(item.getAnyType())));
+ }
+ });
}
@Override
@@ -199,7 +200,6 @@ public class ResourceProvisionPanel extends AbstractModalPanel<Serializable> {
ResourceProvisionPanel.this.aboutRealmProvison.setVisible(true);
target.add(ResourceProvisionPanel.this.aboutRealmProvison);
}
-
};
builder.setItems(resourceTO.getProvisions());
@@ -209,82 +209,82 @@ public class ResourceProvisionPanel extends AbstractModalPanel<Serializable> {
builder.
addAction(new ActionLink<ProvisionTO>() {
- private static final long serialVersionUID = -3722207913631435504L;
+ private static final long serialVersionUID = -3722207913631435504L;
- @Override
- public void onClick(final AjaxRequestTarget target, final ProvisionTO provisionTO) {
- send(ResourceProvisionPanel.this, Broadcast.DEPTH,
- new AjaxWizard.NewItemActionEvent<>(provisionTO, 2, target).setResourceModel(
- new StringResourceModel("inner.provision.mapping",
- ResourceProvisionPanel.this,
- Model.of(provisionTO))));
- }
- }, ActionLink.ActionType.MAPPING, StandardEntitlement.RESOURCE_UPDATE).
+ @Override
+ public void onClick(final AjaxRequestTarget target, final ProvisionTO provisionTO) {
+ send(ResourceProvisionPanel.this, Broadcast.DEPTH,
+ new AjaxWizard.NewItemActionEvent<>(provisionTO, 2, target).setResourceModel(
+ new StringResourceModel("inner.provision.mapping",
+ ResourceProvisionPanel.this,
+ Model.of(provisionTO))));
+ }
+ }, ActionLink.ActionType.MAPPING, StandardEntitlement.RESOURCE_UPDATE).
addAction(new ActionLink<ProvisionTO>() {
- private static final long serialVersionUID = -7780999687733432439L;
+ private static final long serialVersionUID = -7780999687733432439L;
- @Override
- public void onClick(final AjaxRequestTarget target, final ProvisionTO provisionTO) {
- try {
- SyncopeConsoleSession.get().getService(ResourceService.class).
- setLatestSyncToken(resourceTO.getKey(), provisionTO.getAnyType());
- SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
- } catch (Exception e) {
- LOG.error("While setting latest sync token for {}/{}",
- resourceTO.getKey(), provisionTO.getAnyType(), e);
- SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().
- getName() : e.getMessage());
- }
- ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
- }
- }, ActionLink.ActionType.SET_LATEST_SYNC_TOKEN, StandardEntitlement.RESOURCE_UPDATE).
+ @Override
+ public void onClick(final AjaxRequestTarget target, final ProvisionTO provisionTO) {
+ try {
+ SyncopeConsoleSession.get().getService(ResourceService.class).
+ setLatestSyncToken(resourceTO.getKey(), provisionTO.getAnyType());
+ SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
+ } catch (Exception e) {
+ LOG.error("While setting latest sync token for {}/{}",
+ resourceTO.getKey(), provisionTO.getAnyType(), e);
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().
+ getName() : e.getMessage());
+ }
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
+ }
+ }, ActionLink.ActionType.SET_LATEST_SYNC_TOKEN, StandardEntitlement.RESOURCE_UPDATE).
addAction(new ActionLink<ProvisionTO>() {
- private static final long serialVersionUID = -7780999687733432439L;
+ private static final long serialVersionUID = -7780999687733432439L;
- @Override
- public void onClick(final AjaxRequestTarget target, final ProvisionTO provisionTO) {
- try {
- SyncopeConsoleSession.get().getService(ResourceService.class).
- removeSyncToken(resourceTO.getKey(), provisionTO.getAnyType());
- SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
- } catch (Exception e) {
- LOG.error("While removing sync token for {}/{}",
- resourceTO.getKey(), provisionTO.getAnyType(), e);
- SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().
- getName() : e.getMessage());
- }
- ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
- }
- }, ActionLink.ActionType.REMOVE_SYNC_TOKEN, StandardEntitlement.RESOURCE_UPDATE).
+ @Override
+ public void onClick(final AjaxRequestTarget target, final ProvisionTO provisionTO) {
+ try {
+ SyncopeConsoleSession.get().getService(ResourceService.class).
+ removeSyncToken(resourceTO.getKey(), provisionTO.getAnyType());
+ SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
+ } catch (Exception e) {
+ LOG.error("While removing sync token for {}/{}",
+ resourceTO.getKey(), provisionTO.getAnyType(), e);
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().
+ getName() : e.getMessage());
+ }
+ ((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
+ }
+ }, ActionLink.ActionType.REMOVE_SYNC_TOKEN, StandardEntitlement.RESOURCE_UPDATE).
addAction(new ActionLink<ProvisionTO>() {
- private static final long serialVersionUID = -3722207913631435534L;
+ private static final long serialVersionUID = -3722207913631435534L;
- @Override
- public void onClick(final AjaxRequestTarget target, final ProvisionTO provisionTO) {
- final ProvisionTO clone = SerializationUtils.clone(provisionTO);
- clone.setKey(null);
- clone.setAnyType(null);
- clone.setObjectClass(null);
- send(ResourceProvisionPanel.this, Broadcast.DEPTH,
- new AjaxWizard.NewItemActionEvent<>(clone, target).setResourceModel(
- new StringResourceModel("inner.provision.clone",
- ResourceProvisionPanel.this,
- Model.of(provisionTO))));
- }
- }, ActionLink.ActionType.CLONE, StandardEntitlement.RESOURCE_CREATE).
+ @Override
+ public void onClick(final AjaxRequestTarget target, final ProvisionTO provisionTO) {
+ final ProvisionTO clone = SerializationUtils.clone(provisionTO);
+ clone.setKey(null);
+ clone.setAnyType(null);
+ clone.setObjectClass(null);
+ send(ResourceProvisionPanel.this, Broadcast.DEPTH,
+ new AjaxWizard.NewItemActionEvent<>(clone, target).setResourceModel(
+ new StringResourceModel("inner.provision.clone",
+ ResourceProvisionPanel.this,
+ Model.of(provisionTO))));
+ }
+ }, ActionLink.ActionType.CLONE, StandardEntitlement.RESOURCE_CREATE).
addAction(new ActionLink<ProvisionTO>() {
- private static final long serialVersionUID = -3722207913631435544L;
+ private static final long serialVersionUID = -3722207913631435544L;
- @Override
- public void onClick(final AjaxRequestTarget target, final ProvisionTO provisionTO) {
- resourceTO.getProvisions().remove(provisionTO);
- send(ResourceProvisionPanel.this, Broadcast.DEPTH, new ListViewReload<>(target));
- }
- }, ActionLink.ActionType.DELETE, StandardEntitlement.RESOURCE_DELETE);
+ @Override
+ public void onClick(final AjaxRequestTarget target, final ProvisionTO provisionTO) {
+ resourceTO.getProvisions().remove(provisionTO);
+ send(ResourceProvisionPanel.this, Broadcast.DEPTH, new ListViewReload<>(target));
+ }
+ }, ActionLink.ActionType.DELETE, StandardEntitlement.RESOURCE_DELETE);
builder.addNewItemPanelBuilder(wizard);
http://git-wip-us.apache.org/repos/asf/syncope/blob/3f120699/client/console/src/main/resources/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.properties
index fc01436..267c1c8 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel.properties
@@ -40,3 +40,4 @@ enable=Enable
inner.provision.mapping=${anyType} provision
inner.provision.clone=Clone provision '${key}'
enableRealmsProvision=Enable realm provisioning
+enableRealmsProvision.title=Enable the possibility to provision realms towards external resource
http://git-wip-us.apache.org/repos/asf/syncope/blob/3f120699/client/console/src/main/resources/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel_it.properties
index 3698695..fe7aff5 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel_it.properties
@@ -40,3 +40,4 @@ enable=Abilita
inner.provision.mapping=Provision ${anyType}
inner.provision.clone=Clona il provision '${key}'
enableRealmsProvision=Abilita il provisioning dei realm
+enableRealmsProvision.title=Abilita la possibilit\u00e0 di effettuare il provisioning dei realm verso la risorsa esterna
http://git-wip-us.apache.org/repos/asf/syncope/blob/3f120699/client/console/src/main/resources/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel_pt_BR.properties
index 9949a26..66c2d70 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel_pt_BR.properties
@@ -40,3 +40,4 @@ enable=Habilitado
inner.provision.mapping=${anyType} provision
inner.provision.clone=Clone provision '${key}'
enableRealmsProvision=Enable realm provisioning
+enableRealmsProvision.title=Enable the possibility to provision realms towards external resource
http://git-wip-us.apache.org/repos/asf/syncope/blob/3f120699/client/console/src/main/resources/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel_ru.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel_ru.properties
index 24c5f0f..5750a4a 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel_ru.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/resources/ResourceProvisionPanel_ru.properties
@@ -61,3 +61,4 @@ enable=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c
inner.provision.mapping=${anyType} provision
inner.provision.clone=Clone provision '${key}'
enableRealmsProvision=Enable realm provisioning
+enableRealmsProvision.title=Enable the possibility to provision realms towards external resource