You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by sk...@apache.org on 2019/10/04 13:23:51 UTC

[syncope] branch 2_1_X updated: Removed wrongly committed changes

This is an automated email from the ASF dual-hosted git repository.

skylark17 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 4e2853a  Removed wrongly committed changes
4e2853a is described below

commit 4e2853a92e7a46e1d8eab68f761031506f7aa06e
Author: Matteo Alessandroni <ma...@tirasa.net>
AuthorDate: Fri Oct 4 15:23:40 2019 +0200

    Removed wrongly committed changes
---
 .../client/console/panels/UserDirectoryPanel.java  | 25 ----------------------
 .../wicket/markup/html/form/ActionLink.java        |  1 -
 .../markup/html/form/ActionsPanel.properties       |  4 ----
 .../markup/html/form/ActionsPanel_it.properties    |  4 ----
 .../markup/html/form/ActionsPanel_ja.properties    |  4 ----
 .../markup/html/form/ActionsPanel_pt_BR.properties |  4 ----
 .../markup/html/form/ActionsPanel_ru.properties    |  4 ----
 7 files changed, 46 deletions(-)

diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
index 3b837de..597a4f5 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
@@ -341,31 +341,6 @@ public class UserDirectoryPanel extends AnyDirectoryPanel<UserTO, UserRestClient
             }
         }, ActionType.DELETE, StandardEntitlement.USER_DELETE, true).setRealm(realm);
 
-        panel.add(new ActionLink<UserTO>() {
-
-            private static final long serialVersionUID = 8011039414597736111L;
-
-            @Override
-            public void onClick(final AjaxRequestTarget target, final UserTO ignore) {
-                IModel<AnyWrapper<UserTO>> formModel = new CompoundPropertyModel<>(
-                        new AnyWrapper<>(model.getObject()));
-                altDefaultModal.setFormModel(formModel);
-
-                target.add(altDefaultModal.setContent(new AnyStatusModal<>(
-                        altDefaultModal,
-                        pageRef,
-                        formModel.getObject().getInnerObject(),
-                        "resource",
-                        false)));
-
-                altDefaultModal.header(new Model<>(
-                        getString("any.edit", new Model<>(new AnyWrapper<>(model.getObject())))));
-
-                altDefaultModal.show(true);
-            }
-        }, ActionType.MANAGE_ACCOUNTS,
-                String.format("%s,%s", StandardEntitlement.USER_READ, StandardEntitlement.USER_UPDATE));
-
         return panel;
     }
 
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java
index d8dfba0..c237bd4 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java
@@ -93,7 +93,6 @@ public abstract class ActionLink<T extends Serializable> implements Serializable
         RECONCILIATION_PUSH("update"),
         RECONCILIATION_PULL("update"),
         MANAGE_RESOURCES("update"),
-        MANAGE_ACCOUNTS("update"),
         MANAGE_USERS("update"),
         MANAGE_GROUPS("update"),
         PROPAGATION_TASKS("read"),
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 c80fe67..e5affd7 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
@@ -233,7 +233,3 @@ zoom_in.alt=zoom-in icon
 zoom_out.class=fa fa-search-minus
 zoom_out.title=zoom-out
 zoom_out.alt=zoom-out icon
-
-manage_accounts.class=fa fa-sitemap
-manage_accounts.title=manage accounts
-manage_accounts.alt=manage accounts 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 e3b094b..d0dbb16 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
@@ -231,7 +231,3 @@ reconciliation_push.alt=reconciliation push icon
 reconciliation_pull.class=fa-chevron-circle-left
 reconciliation_pull.title=pull
 reconciliation_pull.alt=reconciliation pull icon
-
-manage_accounts.class=fa fa-sitemap
-manage_accounts.title=manage accounts
-manage_accounts.alt=manage accounts 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 0cc0089..599edfa 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
@@ -231,7 +231,3 @@ reconciliation_push.alt=reconciliation push icon
 reconciliation_pull.class=fa-chevron-circle-left
 reconciliation_pull.title=pull
 reconciliation_pull.alt=reconciliation pull icon
-
-manage_accounts.class=fa fa-sitemap
-manage_accounts.title=\u30a2\u30ab\u30a6\u30f3\u30c8\u3092\u7ba1\u7406\u3059\u308b
-manage_accounts.alt=\u30a2\u30ab\u30a6\u30f3\u30c8\u7ba1\u7406\u30a2\u30a4\u30b3\u30f3
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 06eeb22..4aedf76 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
@@ -231,7 +231,3 @@ reconciliation_push.alt=reconciliation push icon
 reconciliation_pull.class=fa-chevron-circle-left
 reconciliation_pull.title=pull
 reconciliation_pull.alt=reconciliation pull icon
-
-manage_accounts.class=fa fa-sitemap
-manage_accounts.title=manage accounts
-manage_accounts.alt=manage accounts 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 43c3346..e7fc2d3 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
@@ -231,7 +231,3 @@ reconciliation_push.alt=reconciliation push icon
 reconciliation_pull.class=fa-chevron-circle-left
 reconciliation_pull.title=pull
 reconciliation_pull.alt=reconciliation pull icon
-
-manage_accounts.class=fa fa-sitemap
-manage_accounts.title=manage accounts
-manage_accounts.alt=manage accounts icon