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 649a215 Fixing entitlements for Reports
649a215 is described below
commit 649a2157381711d8e4f53b26d4ea5dd6e5210d87
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Thu Jun 11 16:26:51 2020 +0200
Fixing entitlements for Reports
---
.../org/apache/syncope/client/console/commons/Constants.java | 2 ++
.../org/apache/syncope/client/console/pages/Reports.java | 2 +-
.../client/console/reports/ReportTemplateDirectoryPanel.java | 12 ++++++------
.../client/console/reports/ReportletDirectoryPanel.java | 2 +-
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
b/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
index 7367198..1b46767 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/commons/Constants.java
@@ -149,6 +149,8 @@ public final class Constants {
public static final String PREF_MAIL_TEMPLATE_PAGINATOR_ROWS =
"mail.template.paginator.rows";
+ public static final String PREF_REPORT_TEMPLATE_PAGINATOR_ROWS =
"report.template.paginator.rows";
+
public static final String PREF_PROPAGATION_TASKS_PAGINATOR_ROWS =
"proagationtasks.paginator.rows";
public static final String PREF_CONNECTOR_HISTORY_CONF_PAGINATOR_ROWS =
"connectorhistoryconf.paginator.rows";
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/pages/Reports.java
b/client/console/src/main/java/org/apache/syncope/client/console/pages/Reports.java
index f51d647..889559d 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/pages/Reports.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/pages/Reports.java
@@ -62,7 +62,7 @@ public class Reports extends BasePage {
@Override
public Panel getPanel(final String panelId) {
- final MultilevelPanel mlp = new MultilevelPanel(panelId);
+ MultilevelPanel mlp = new MultilevelPanel(panelId);
mlp.setFirstLevel(new ReportDirectoryPanel(mlp,
getPageReference()) {
private static final long serialVersionUID =
-2195387360323687302L;
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 c1a6ae7..c23bbc6 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
@@ -104,7 +104,7 @@ public class ReportTemplateDirectoryPanel
initResultTable();
- MetaDataRoleAuthorizationStrategy.authorize(addAjaxLink, RENDER,
StandardEntitlement.MAIL_TEMPLATE_CREATE);
+ MetaDataRoleAuthorizationStrategy.authorize(addAjaxLink, RENDER,
StandardEntitlement.REPORT_TEMPLATE_CREATE);
}
@Override
@@ -136,7 +136,7 @@ public class ReportTemplateDirectoryPanel
utilityModal.show(true);
target.add(utilityModal);
}
- }, ActionLink.ActionType.FO_EDIT,
StandardEntitlement.MAIL_TEMPLATE_UPDATE);
+ }, ActionLink.ActionType.FO_EDIT,
StandardEntitlement.REPORT_TEMPLATE_UPDATE);
panel.add(new ActionLink<ReportTemplateTO>() {
@@ -154,7 +154,7 @@ public class ReportTemplateDirectoryPanel
utilityModal.show(true);
target.add(utilityModal);
}
- }, ActionLink.ActionType.HTML,
StandardEntitlement.MAIL_TEMPLATE_UPDATE);
+ }, ActionLink.ActionType.HTML,
StandardEntitlement.REPORT_TEMPLATE_UPDATE);
panel.add(new ActionLink<ReportTemplateTO>() {
@@ -172,7 +172,7 @@ public class ReportTemplateDirectoryPanel
utilityModal.show(true);
target.add(utilityModal);
}
- }, ActionLink.ActionType.TEXT,
StandardEntitlement.MAIL_TEMPLATE_UPDATE);
+ }, ActionLink.ActionType.TEXT,
StandardEntitlement.REPORT_TEMPLATE_UPDATE);
panel.add(new ActionLink<ReportTemplateTO>() {
@@ -190,7 +190,7 @@ public class ReportTemplateDirectoryPanel
}
((BasePage)
pageRef.getPage()).getNotificationPanel().refresh(target);
}
- }, ActionLink.ActionType.DELETE,
StandardEntitlement.MAIL_TEMPLATE_DELETE, true);
+ }, ActionLink.ActionType.DELETE,
StandardEntitlement.REPORT_TEMPLATE_DELETE, true);
return panel;
}
@@ -202,7 +202,7 @@ public class ReportTemplateDirectoryPanel
@Override
protected String paginatorRowsKey() {
- return Constants.PREF_MAIL_TEMPLATE_PAGINATOR_ROWS;
+ return Constants.PREF_REPORT_TEMPLATE_PAGINATOR_ROWS;
}
@Override
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java
index ae29f84..ea38725 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java
@@ -162,7 +162,7 @@ public class ReportletDirectoryPanel extends DirectoryPanel<
}
((BasePage)
pageRef.getPage()).getNotificationPanel().refresh(target);
}
- }, ActionLink.ActionType.DELETE, StandardEntitlement.REPORT_DELETE,
true);
+ }, ActionLink.ActionType.DELETE, StandardEntitlement.REPORT_UPDATE);
return panel;
}
