Repository: syncope Updated Branches: refs/heads/master 030defd12 -> 5f6720e49
Fixing Status Console problem Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/5f6720e4 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/5f6720e4 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/5f6720e4 Branch: refs/heads/master Commit: 5f6720e493e9ae0b796a89353227c9faf3a62e0c Parents: 030defd Author: Colm O hEigeartaigh <[email protected]> Authored: Tue Jul 18 18:50:58 2017 +0100 Committer: Colm O hEigeartaigh <[email protected]> Committed: Tue Jul 18 18:50:58 2017 +0100 ---------------------------------------------------------------------- .../org/apache/syncope/client/console/bulk/BulkContent.java | 6 +++--- .../syncope/client/console/panels/AnyObjectDirectoryPanel.java | 2 +- .../syncope/client/console/panels/GroupDirectoryPanel.java | 2 +- .../syncope/client/console/panels/UserDirectoryPanel.java | 4 ++-- .../syncope/client/console/status/AnyStatusDirectoryPanel.java | 4 ++-- .../apache/syncope/client/console/wizards/any/StatusPanel.java | 2 +- .../syncope/client/console/status/StatusModal.properties | 2 +- .../syncope/client/console/status/StatusModal_it.properties | 2 +- .../syncope/client/console/status/StatusModal_pt_BR.properties | 2 +- .../syncope/client/console/status/StatusModal_ru.properties | 2 +- .../syncope/client/console/wizards/any/StatusPanel.properties | 2 +- .../client/console/wizards/any/StatusPanel_it.properties | 2 +- .../client/console/wizards/any/StatusPanel_pt_BR.properties | 2 +- .../client/console/wizards/any/StatusPanel_ru.properties | 4 ++-- 14 files changed, 19 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/5f6720e4/client/console/src/main/java/org/apache/syncope/client/console/bulk/BulkContent.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/bulk/BulkContent.java b/client/console/src/main/java/org/apache/syncope/client/console/bulk/BulkContent.java index de3ceb7..d40cf37 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/bulk/BulkContent.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/bulk/BulkContent.java @@ -204,12 +204,12 @@ public class BulkContent<T extends Serializable, S> extends MultilevelPanel.Seco case "REACTIVATE": res = ((UserRestClient) anyRestClient). reactivate(etag, entry.getKey(), entry.getValue()); - fieldName = "resourceName"; + fieldName = "resource"; break; case "SUSPEND": res = ((UserRestClient) anyRestClient). suspend(etag, entry.getKey(), entry.getValue()); - fieldName = "resourceName"; + fieldName = "resource"; break; default: break; @@ -236,7 +236,7 @@ public class BulkContent<T extends Serializable, S> extends MultilevelPanel.Seco target.add(actionPanel); SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED)); - } catch (IllegalArgumentException | NoSuchMethodException | SecurityException + } catch (IllegalArgumentException | NoSuchMethodException | SecurityException | IllegalAccessException | InvocationTargetException e) { LOG.error("Bulk action failure", e); SyncopeConsoleSession.get().error("Operation " + actionToBeAddresed.getActionId() http://git-wip-us.apache.org/repos/asf/syncope/blob/5f6720e4/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java index 2b7d154..1c2cc52 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java @@ -145,7 +145,7 @@ public class AnyObjectDirectoryPanel extends AnyDirectoryPanel<AnyObjectTO, AnyO altDefaultModal, pageRef, formModel.getObject().getInnerObject(), - "resourceName", + "resource", false))); altDefaultModal.header(new Model<>( http://git-wip-us.apache.org/repos/asf/syncope/blob/5f6720e4/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupDirectoryPanel.java index d4e182e..0c36d43 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/GroupDirectoryPanel.java @@ -320,7 +320,7 @@ public class GroupDirectoryPanel extends AnyDirectoryPanel<GroupTO, GroupRestCli altDefaultModal, pageRef, formModel.getObject().getInnerObject(), - "resourceName", + "resource", false))); altDefaultModal.header(new Model<>( http://git-wip-us.apache.org/repos/asf/syncope/blob/5f6720e4/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java ---------------------------------------------------------------------- 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 2845ad9..cae0df9 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 @@ -222,7 +222,7 @@ public class UserDirectoryPanel extends AnyDirectoryPanel<UserTO, UserRestClient altDefaultModal, pageRef, formModel.getObject().getInnerObject(), - "resourceName", + "resource", true))); altDefaultModal.header(new Model<>( @@ -246,7 +246,7 @@ public class UserDirectoryPanel extends AnyDirectoryPanel<UserTO, UserRestClient altDefaultModal, pageRef, formModel.getObject().getInnerObject(), - "resourceName", + "resource", false))); altDefaultModal.header(new Model<>( http://git-wip-us.apache.org/repos/asf/syncope/blob/5f6720e4/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java index 6fcc84b..c5a90e8 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/status/AnyStatusDirectoryPanel.java @@ -111,7 +111,7 @@ public class AnyStatusDirectoryPanel final List<IColumn<StatusBean, String>> columns = new ArrayList<>(); columns.add(new AbstractColumn<StatusBean, String>( - new StringResourceModel("resourceName", this), "resourceName") { + new StringResourceModel("resource", this), "resource") { private static final long serialVersionUID = 2054811145491901166L; @@ -222,7 +222,7 @@ public class AnyStatusDirectoryPanel private final StatusUtils statusUtils; AttributableStatusProvider() { - super(statusOnly ? "resourceName" : "connObjectLink"); + super(statusOnly ? "resource" : "connObjectLink"); statusUtils = new StatusUtils(); } http://git-wip-us.apache.org/repos/asf/syncope/blob/5f6720e4/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/StatusPanel.java ---------------------------------------------------------------------- diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/StatusPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/StatusPanel.java index 565c985..cc1a2cc 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/StatusPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/StatusPanel.java @@ -153,7 +153,7 @@ public class StatusPanel extends Panel { builder.setModel(model); builder.setItems(statusBeans); - builder.includes("resourceName", "connObjectLink", "status"); + builder.includes("resource", "connObjectLink", "status"); builder.withChecks(ListViewPanel.CheckAvailability.NONE); builder.setReuseItem(false); http://git-wip-us.apache.org/repos/asf/syncope/blob/5f6720e4/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal.properties b/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal.properties index da7d533..c3692e5 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal.properties @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -resourceName=Resource +resource=Resource connObjectLink=Remote ID anyKey=Local ID status=Status http://git-wip-us.apache.org/repos/asf/syncope/blob/5f6720e4/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_it.properties index c04df69..a84d04a 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_it.properties @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -resourceName=Risorsa +resource=Risorsa connObjectLink=ID Remoto status=Stato anyKey=ID Locale http://git-wip-us.apache.org/repos/asf/syncope/blob/5f6720e4/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_pt_BR.properties index 3648301..6c19010 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_pt_BR.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_pt_BR.properties @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -resourceName=Resource +resource=Resource connObjectLink=Remote ID status=Status anyKey=Local ID http://git-wip-us.apache.org/repos/asf/syncope/blob/5f6720e4/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_ru.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_ru.properties index 0841fce..be67fdd 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_ru.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/status/StatusModal_ru.properties @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. # -resourceName=\u0420\u0435\u0441\u0443\u0440\u0441 +resource=\u0420\u0435\u0441\u0443\u0440\u0441 connObjectLink=\u0423\u0447\u0435\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c status=\u0421\u0442\u0430\u0442\u0443\u0441 anyKey=\u041b\u043e\u043a\u0430\u043b\u044c\u043d\u044b\u0439 ID http://git-wip-us.apache.org/repos/asf/syncope/blob/5f6720e4/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/StatusPanel.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/StatusPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/StatusPanel.properties index ef1cdf0..a198c98 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/StatusPanel.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/StatusPanel.properties @@ -14,6 +14,6 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -resourceName=Resource +resource=Resource connObjectLink=Remote ID status=Status http://git-wip-us.apache.org/repos/asf/syncope/blob/5f6720e4/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/StatusPanel_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/StatusPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/StatusPanel_it.properties index 948b49d..7d47cb1 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/StatusPanel_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/StatusPanel_it.properties @@ -14,6 +14,6 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -resourceName=Risorsa +resource=Risorsa connObjectLink=ID Remoto status=Stato http://git-wip-us.apache.org/repos/asf/syncope/blob/5f6720e4/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/StatusPanel_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/StatusPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/StatusPanel_pt_BR.properties index 5202d32..a330519 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/StatusPanel_pt_BR.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/StatusPanel_pt_BR.properties @@ -14,6 +14,6 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -resourceName=Recurso +resource=Recurso connObjectLink=ID Remoto status=Estado http://git-wip-us.apache.org/repos/asf/syncope/blob/5f6720e4/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/StatusPanel_ru.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/StatusPanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/StatusPanel_ru.properties index 5c5cd60..6d01c51 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/StatusPanel_ru.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/wizards/any/StatusPanel_ru.properties @@ -15,8 +15,8 @@ # specific language governing permissions and limitations # under the License. -# resourceName=РеÑÑÑÑ -resourceName=\u0420\u0435\u0441\u0443\u0440\u0441 +# resource=РеÑÑÑÑ +resource=\u0420\u0435\u0441\u0443\u0440\u0441 # connObjectLink=УÑеÑÐ½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ connObjectLink=\u0423\u0447\u0435\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c # status=СÑаÑÑÑ
