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/06/13 14:02:14 UTC
[1/2] syncope git commit: [SYNCOPE-1108] Avoid sending empty content
to Core
Repository: syncope
Updated Branches:
refs/heads/2_0_X e5a8f1f92 -> 35019bc57
refs/heads/master 06f3fdd73 -> 9f979f6aa
[SYNCOPE-1108] Avoid sending empty content to Core
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/35019bc5
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/35019bc5
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/35019bc5
Branch: refs/heads/2_0_X
Commit: 35019bc576c9ed826bffb304021e014ed9de7519
Parents: e5a8f1f
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Jun 13 16:01:53 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Jun 13 16:01:53 2017 +0200
----------------------------------------------------------------------
.../MailTemplateDirectoryPanel.java | 25 +++++++++-------
.../console/notifications/TemplateModal.java | 4 +--
.../console/panels/RoleDirectoryPanel.java | 3 +-
.../console/panels/StartAtTogglePanel.java | 4 +--
.../policies/PolicyModalPanelBuilder.java | 4 +--
.../reports/ReportTemplateDirectoryPanel.java | 31 +++++++++++---------
.../console/topology/TopologyTogglePanel.java | 8 ++---
.../resources/ResourceProvisionPanel.java | 12 ++++----
.../ReportTemplateDirectoryPanel.properties | 1 +
.../ReportTemplateDirectoryPanel_it.properties | 1 +
...eportTemplateDirectoryPanel_pt_BR.properties | 1 +
.../ReportTemplateDirectoryPanel_ru.properties | 1 +
12 files changed, 52 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/35019bc5/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java
index 55c4bd0..355e001 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java
@@ -246,17 +246,20 @@ public class MailTemplateDirectoryPanel
@Override
public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
- try {
- restClient.updateTemplateFormat(
- content.getKey(), content.getContent(), content.getFormat());
- SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
- modal.show(false);
- modal.close(target);
- } catch (Exception e) {
- LOG.error("While updating template for {}", content.getKey(), e);
- SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
- ? e.getClass().getName() : e.
- getMessage());
+ if (StringUtils.isBlank(content.getContent())) {
+ SyncopeConsoleSession.get().error("No content to save");
+ } else {
+ try {
+ restClient.updateTemplateFormat(
+ content.getKey(), content.getContent(), content.getFormat());
+ SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
+ modal.show(false);
+ modal.close(target);
+ } catch (Exception e) {
+ LOG.error("While updating template for {}", content.getKey(), e);
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ ? e.getClass().getName() : e.getMessage());
+ }
}
((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/35019bc5/client/console/src/main/java/org/apache/syncope/client/console/notifications/TemplateModal.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/notifications/TemplateModal.java b/client/console/src/main/java/org/apache/syncope/client/console/notifications/TemplateModal.java
index d802f66..69ac0eb 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/notifications/TemplateModal.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/notifications/TemplateModal.java
@@ -69,8 +69,8 @@ public class TemplateModal<T extends EntityTO, F> extends AbstractModalPanel<T>
modal.close(target);
} catch (SyncopeClientException e) {
LOG.error("While creating template for {}", templateTO.getKey(), e);
- SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().getName() : e.
- getMessage());
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ ? e.getClass().getName() : e.getMessage());
}
((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/35019bc5/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDirectoryPanel.java
index f037a33..bb7d9d9 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDirectoryPanel.java
@@ -226,8 +226,7 @@ public class RoleDirectoryPanel extends DirectoryPanel<RoleTO, RoleWrapper, Role
} catch (Exception e) {
LOG.error("While updating onsole layout info for role {}", info.getKey(), e);
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
- ? e.getClass().getName() : e.
- getMessage());
+ ? e.getClass().getName() : e.getMessage());
}
((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/35019bc5/client/console/src/main/java/org/apache/syncope/client/console/panels/StartAtTogglePanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/StartAtTogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/StartAtTogglePanel.java
index 5fabc64..18c35cd 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/StartAtTogglePanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/StartAtTogglePanel.java
@@ -86,8 +86,8 @@ public abstract class StartAtTogglePanel extends TogglePanel<Serializable> {
toggle(target, false);
target.add(container);
} catch (SyncopeClientException e) {
- SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().getName() : e.
- getMessage());
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ ? e.getClass().getName() : e.getMessage());
LOG.error("While running task {}", key, e);
}
((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
http://git-wip-us.apache.org/repos/asf/syncope/blob/35019bc5/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java
index 05f123f..7507d04 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java
@@ -164,8 +164,8 @@ public class PolicyModalPanelBuilder<T extends AbstractPolicyTO> extends Abstrac
Profile.this.modal.close(target);
} catch (Exception e) {
LOG.error("While creating/updating policy", e);
- SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().getName() : e.
- getMessage());
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ ? e.getClass().getName() : e.getMessage());
}
((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/35019bc5/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java
index d3969b3..13a76c0 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java
@@ -131,7 +131,7 @@ public class ReportTemplateDirectoryPanel
content.setContent(
restClient.readTemplateFormat(model.getObject().getKey(), ReportTemplateFormat.FO));
- utilityModal.header(new ResourceModel("report.template.fo", "FO Content"));
+ utilityModal.header(new ResourceModel("report.template.fo", "XSLT for XSL-FO"));
utilityModal.setContent(new TemplateContentEditorPanel(content, pageRef));
utilityModal.show(true);
target.add(utilityModal);
@@ -149,7 +149,7 @@ public class ReportTemplateDirectoryPanel
content.setContent(
restClient.readTemplateFormat(model.getObject().getKey(), ReportTemplateFormat.HTML));
- utilityModal.header(new ResourceModel("report.template.html", "HTML Content"));
+ utilityModal.header(new ResourceModel("report.template.html", "XSLT for HTML"));
utilityModal.setContent(new TemplateContentEditorPanel(content, pageRef));
utilityModal.show(true);
target.add(utilityModal);
@@ -167,7 +167,7 @@ public class ReportTemplateDirectoryPanel
content.setContent(
restClient.readTemplateFormat(model.getObject().getKey(), ReportTemplateFormat.CSV));
- utilityModal.header(new ResourceModel("report.template.text", "TEXT Content"));
+ utilityModal.header(new ResourceModel("report.template.csv", "XSLT for CSV"));
utilityModal.setContent(new TemplateContentEditorPanel(content, pageRef));
utilityModal.show(true);
target.add(utilityModal);
@@ -266,17 +266,20 @@ public class ReportTemplateDirectoryPanel
@Override
public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
- try {
- restClient.updateTemplateFormat(
- content.getKey(), content.getContent(), content.getFormat());
- SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
- modal.show(false);
- modal.close(target);
- } catch (Exception e) {
- LOG.error("While updating template for {}", content.getKey(), e);
- SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
- ? e.getClass().getName() : e.
- getMessage());
+ if (StringUtils.isBlank(content.getContent())) {
+ SyncopeConsoleSession.get().error("No content to save");
+ } else {
+ try {
+ restClient.updateTemplateFormat(
+ content.getKey(), content.getContent(), content.getFormat());
+ SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
+ modal.show(false);
+ modal.close(target);
+ } catch (Exception e) {
+ LOG.error("While updating template for {}", content.getKey(), e);
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ ? e.getClass().getName() : e.getMessage());
+ }
}
((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/35019bc5/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 505b295..0851437 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
@@ -252,8 +252,8 @@ public class TopologyTogglePanel extends TogglePanel<Serializable> {
toggle(target, false);
} catch (SyncopeClientException e) {
LOG.error("While deleting resource {}", node.getKey(), e);
- SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().getName() : e.
- getMessage());
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ ? e.getClass().getName() : e.getMessage());
}
((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
@@ -344,8 +344,8 @@ public class TopologyTogglePanel extends TogglePanel<Serializable> {
toggle(target, false);
} catch (SyncopeClientException e) {
LOG.error("While deleting resource {}", node.getKey(), e);
- SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().getName() : e.
- getMessage());
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ ? e.getClass().getName() : e.getMessage());
}
((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/35019bc5/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 6901480..7bc48d0 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
@@ -245,8 +245,8 @@ public class ResourceProvisionPanel extends AbstractModalPanel<Serializable> {
} 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());
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ ? e.getClass().getName() : e.getMessage());
}
((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
@@ -263,8 +263,8 @@ public class ResourceProvisionPanel extends AbstractModalPanel<Serializable> {
} 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());
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ ? e.getClass().getName() : e.getMessage());
}
((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
@@ -336,8 +336,8 @@ public class ResourceProvisionPanel extends AbstractModalPanel<Serializable> {
modal.close(target);
} catch (Exception e) {
LOG.error("While creating or updating {}", resourceTO, e);
- SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().getName() : e.
- getMessage());
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ ? e.getClass().getName() : e.getMessage());
}
((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/35019bc5/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.properties
index c8af92f..f146466 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.properties
@@ -18,3 +18,4 @@ any.edit=Edit ${key}
any.new=New report template
any.finish=Submit
any.cancel=Cancel
+text.title=csv
http://git-wip-us.apache.org/repos/asf/syncope/blob/35019bc5/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_it.properties
index 5f60980..7eac805 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_it.properties
@@ -18,3 +18,4 @@ any.edit=Modifica ${key}
any.new=New report template
any.finish=Invia
any.cancel=Annulla
+text.title=csv
http://git-wip-us.apache.org/repos/asf/syncope/blob/35019bc5/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_pt_BR.properties
index 43c6aa0..be70e5c 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_pt_BR.properties
@@ -18,3 +18,4 @@ any.edit=Editar ${key}
any.new=Novo report template
any.finish=Enviar
any.cancel=Cancelar
+text.title=csv
http://git-wip-us.apache.org/repos/asf/syncope/blob/35019bc5/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_ru.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_ru.properties
index 9f744c0..500e3b4 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_ru.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_ru.properties
@@ -19,3 +19,4 @@ any.edit=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c ${key}
any.new=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0448\u0430\u0431\u043b\u043e\u043d \u043e\u0442\u0447\u0435\u0442\u0430
any.finish=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
any.cancel=\u041e\u0442\u043c\u0435\u043d\u0430
+text.title=csv
[2/2] syncope git commit: [SYNCOPE-1108] Avoid sending empty content
to Core
Posted by il...@apache.org.
[SYNCOPE-1108] Avoid sending empty content to Core
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/9f979f6a
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/9f979f6a
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/9f979f6a
Branch: refs/heads/master
Commit: 9f979f6aa9f98b7fb79fd4bbf300f55aff661ff3
Parents: 06f3fdd
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Tue Jun 13 16:01:53 2017 +0200
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Tue Jun 13 16:02:03 2017 +0200
----------------------------------------------------------------------
.../MailTemplateDirectoryPanel.java | 25 +++++++++-------
.../console/notifications/TemplateModal.java | 4 +--
.../console/panels/RoleDirectoryPanel.java | 3 +-
.../console/panels/StartAtTogglePanel.java | 4 +--
.../policies/PolicyModalPanelBuilder.java | 4 +--
.../reports/ReportTemplateDirectoryPanel.java | 31 +++++++++++---------
.../console/topology/TopologyTogglePanel.java | 8 ++---
.../resources/ResourceProvisionPanel.java | 12 ++++----
.../ReportTemplateDirectoryPanel.properties | 1 +
.../ReportTemplateDirectoryPanel_it.properties | 1 +
...eportTemplateDirectoryPanel_pt_BR.properties | 1 +
.../ReportTemplateDirectoryPanel_ru.properties | 1 +
12 files changed, 52 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/9f979f6a/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java
index 55c4bd0..355e001 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java
@@ -246,17 +246,20 @@ public class MailTemplateDirectoryPanel
@Override
public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
- try {
- restClient.updateTemplateFormat(
- content.getKey(), content.getContent(), content.getFormat());
- SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
- modal.show(false);
- modal.close(target);
- } catch (Exception e) {
- LOG.error("While updating template for {}", content.getKey(), e);
- SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
- ? e.getClass().getName() : e.
- getMessage());
+ if (StringUtils.isBlank(content.getContent())) {
+ SyncopeConsoleSession.get().error("No content to save");
+ } else {
+ try {
+ restClient.updateTemplateFormat(
+ content.getKey(), content.getContent(), content.getFormat());
+ SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
+ modal.show(false);
+ modal.close(target);
+ } catch (Exception e) {
+ LOG.error("While updating template for {}", content.getKey(), e);
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ ? e.getClass().getName() : e.getMessage());
+ }
}
((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/9f979f6a/client/console/src/main/java/org/apache/syncope/client/console/notifications/TemplateModal.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/notifications/TemplateModal.java b/client/console/src/main/java/org/apache/syncope/client/console/notifications/TemplateModal.java
index d802f66..69ac0eb 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/notifications/TemplateModal.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/notifications/TemplateModal.java
@@ -69,8 +69,8 @@ public class TemplateModal<T extends EntityTO, F> extends AbstractModalPanel<T>
modal.close(target);
} catch (SyncopeClientException e) {
LOG.error("While creating template for {}", templateTO.getKey(), e);
- SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().getName() : e.
- getMessage());
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ ? e.getClass().getName() : e.getMessage());
}
((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/9f979f6a/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDirectoryPanel.java
index f037a33..bb7d9d9 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/RoleDirectoryPanel.java
@@ -226,8 +226,7 @@ public class RoleDirectoryPanel extends DirectoryPanel<RoleTO, RoleWrapper, Role
} catch (Exception e) {
LOG.error("While updating onsole layout info for role {}", info.getKey(), e);
SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
- ? e.getClass().getName() : e.
- getMessage());
+ ? e.getClass().getName() : e.getMessage());
}
((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/9f979f6a/client/console/src/main/java/org/apache/syncope/client/console/panels/StartAtTogglePanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/StartAtTogglePanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/StartAtTogglePanel.java
index 5fabc64..18c35cd 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/StartAtTogglePanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/StartAtTogglePanel.java
@@ -86,8 +86,8 @@ public abstract class StartAtTogglePanel extends TogglePanel<Serializable> {
toggle(target, false);
target.add(container);
} catch (SyncopeClientException e) {
- SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().getName() : e.
- getMessage());
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ ? e.getClass().getName() : e.getMessage());
LOG.error("While running task {}", key, e);
}
((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
http://git-wip-us.apache.org/repos/asf/syncope/blob/9f979f6a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java
index 05f123f..7507d04 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyModalPanelBuilder.java
@@ -164,8 +164,8 @@ public class PolicyModalPanelBuilder<T extends AbstractPolicyTO> extends Abstrac
Profile.this.modal.close(target);
} catch (Exception e) {
LOG.error("While creating/updating policy", e);
- SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().getName() : e.
- getMessage());
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ ? e.getClass().getName() : e.getMessage());
}
((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/9f979f6a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java
index d3969b3..13a76c0 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java
@@ -131,7 +131,7 @@ public class ReportTemplateDirectoryPanel
content.setContent(
restClient.readTemplateFormat(model.getObject().getKey(), ReportTemplateFormat.FO));
- utilityModal.header(new ResourceModel("report.template.fo", "FO Content"));
+ utilityModal.header(new ResourceModel("report.template.fo", "XSLT for XSL-FO"));
utilityModal.setContent(new TemplateContentEditorPanel(content, pageRef));
utilityModal.show(true);
target.add(utilityModal);
@@ -149,7 +149,7 @@ public class ReportTemplateDirectoryPanel
content.setContent(
restClient.readTemplateFormat(model.getObject().getKey(), ReportTemplateFormat.HTML));
- utilityModal.header(new ResourceModel("report.template.html", "HTML Content"));
+ utilityModal.header(new ResourceModel("report.template.html", "XSLT for HTML"));
utilityModal.setContent(new TemplateContentEditorPanel(content, pageRef));
utilityModal.show(true);
target.add(utilityModal);
@@ -167,7 +167,7 @@ public class ReportTemplateDirectoryPanel
content.setContent(
restClient.readTemplateFormat(model.getObject().getKey(), ReportTemplateFormat.CSV));
- utilityModal.header(new ResourceModel("report.template.text", "TEXT Content"));
+ utilityModal.header(new ResourceModel("report.template.csv", "XSLT for CSV"));
utilityModal.setContent(new TemplateContentEditorPanel(content, pageRef));
utilityModal.show(true);
target.add(utilityModal);
@@ -266,17 +266,20 @@ public class ReportTemplateDirectoryPanel
@Override
public void onSubmit(final AjaxRequestTarget target, final Form<?> form) {
- try {
- restClient.updateTemplateFormat(
- content.getKey(), content.getContent(), content.getFormat());
- SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
- modal.show(false);
- modal.close(target);
- } catch (Exception e) {
- LOG.error("While updating template for {}", content.getKey(), e);
- SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
- ? e.getClass().getName() : e.
- getMessage());
+ if (StringUtils.isBlank(content.getContent())) {
+ SyncopeConsoleSession.get().error("No content to save");
+ } else {
+ try {
+ restClient.updateTemplateFormat(
+ content.getKey(), content.getContent(), content.getFormat());
+ SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
+ modal.show(false);
+ modal.close(target);
+ } catch (Exception e) {
+ LOG.error("While updating template for {}", content.getKey(), e);
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ ? e.getClass().getName() : e.getMessage());
+ }
}
((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/9f979f6a/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 505b295..0851437 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
@@ -252,8 +252,8 @@ public class TopologyTogglePanel extends TogglePanel<Serializable> {
toggle(target, false);
} catch (SyncopeClientException e) {
LOG.error("While deleting resource {}", node.getKey(), e);
- SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().getName() : e.
- getMessage());
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ ? e.getClass().getName() : e.getMessage());
}
((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
@@ -344,8 +344,8 @@ public class TopologyTogglePanel extends TogglePanel<Serializable> {
toggle(target, false);
} catch (SyncopeClientException e) {
LOG.error("While deleting resource {}", node.getKey(), e);
- SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().getName() : e.
- getMessage());
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ ? e.getClass().getName() : e.getMessage());
}
((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/9f979f6a/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 6901480..7bc48d0 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
@@ -245,8 +245,8 @@ public class ResourceProvisionPanel extends AbstractModalPanel<Serializable> {
} 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());
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ ? e.getClass().getName() : e.getMessage());
}
((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
@@ -263,8 +263,8 @@ public class ResourceProvisionPanel extends AbstractModalPanel<Serializable> {
} 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());
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ ? e.getClass().getName() : e.getMessage());
}
((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
@@ -336,8 +336,8 @@ public class ResourceProvisionPanel extends AbstractModalPanel<Serializable> {
modal.close(target);
} catch (Exception e) {
LOG.error("While creating or updating {}", resourceTO, e);
- SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage()) ? e.getClass().getName() : e.
- getMessage());
+ SyncopeConsoleSession.get().error(StringUtils.isBlank(e.getMessage())
+ ? e.getClass().getName() : e.getMessage());
}
((BasePage) pageRef.getPage()).getNotificationPanel().refresh(target);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/9f979f6a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.properties
index c8af92f..f146466 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.properties
@@ -18,3 +18,4 @@ any.edit=Edit ${key}
any.new=New report template
any.finish=Submit
any.cancel=Cancel
+text.title=csv
http://git-wip-us.apache.org/repos/asf/syncope/blob/9f979f6a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_it.properties
index 5f60980..7eac805 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_it.properties
@@ -18,3 +18,4 @@ any.edit=Modifica ${key}
any.new=New report template
any.finish=Invia
any.cancel=Annulla
+text.title=csv
http://git-wip-us.apache.org/repos/asf/syncope/blob/9f979f6a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_pt_BR.properties
index 43c6aa0..be70e5c 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_pt_BR.properties
@@ -18,3 +18,4 @@ any.edit=Editar ${key}
any.new=Novo report template
any.finish=Enviar
any.cancel=Cancelar
+text.title=csv
http://git-wip-us.apache.org/repos/asf/syncope/blob/9f979f6a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_ru.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_ru.properties
index 9f744c0..500e3b4 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_ru.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel_ru.properties
@@ -19,3 +19,4 @@ any.edit=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c ${key}
any.new=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0448\u0430\u0431\u043b\u043e\u043d \u043e\u0442\u0447\u0435\u0442\u0430
any.finish=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c
any.cancel=\u041e\u0442\u043c\u0435\u043d\u0430
+text.title=csv