Repository: syncope Updated Branches: refs/heads/master ed0c0cf09 -> 81f2e00c8
Using (user)name for modal headers, increase usability Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/81f2e00c Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/81f2e00c Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/81f2e00c Branch: refs/heads/master Commit: 81f2e00c857758b1da8bc12459358c1c25642ffa Parents: ed0c0cf Author: Francesco Chicchiriccò <[email protected]> Authored: Mon Sep 5 16:54:22 2016 +0200 Committer: Francesco Chicchiriccò <[email protected]> Committed: Mon Sep 5 16:54:22 2016 +0200 ---------------------------------------------------------------------- .../client/console/panels/AnyObjectDirectoryPanel.java | 3 +-- .../syncope/client/console/panels/DirectoryPanel.properties | 8 ++++---- .../client/console/panels/DirectoryPanel_it.properties | 8 ++++---- .../client/console/panels/DirectoryPanel_pt_BR.properties | 8 ++++---- .../client/console/panels/DirectoryPanel_ru.properties | 8 ++++---- .../client/console/panels/UserDirectoryPanel.properties | 2 ++ .../client/console/panels/UserDirectoryPanel_it.properties | 2 ++ .../console/panels/UserDirectoryPanel_pt_BR.properties | 2 ++ .../client/console/panels/UserDirectoryPanel_ru.properties | 2 ++ 9 files changed, 25 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/81f2e00c/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 16c5675..ff4d622 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 @@ -169,8 +169,7 @@ public class AnyObjectDirectoryPanel extends AnyDirectoryPanel<AnyObjectTO, AnyO @Override public void onClick(final AjaxRequestTarget target, final AnyObjectTO ignore) { final IModel<AnyWrapper<AnyObjectTO>> formModel = new CompoundPropertyModel<>( - new AnyWrapper<>( - model.getObject())); + new AnyWrapper<>(model.getObject())); altDefaultModal.setFormModel(formModel); target.add(altDefaultModal.setContent(new AnyStatusModal<>( http://git-wip-us.apache.org/repos/asf/syncope/blob/81f2e00c/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel.properties index 6164282..1525221 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel.properties @@ -31,14 +31,14 @@ tokenNotValued=Not valued subject=Subject recipients=Recipients -any.edit=Edit ${anyTO.type} ${anyTO.key} +any.edit=Edit ${anyTO.type} ${anyTO.name} any.new=New ${anyTO.type} any.finish=Submit ${anyTO.type} any.cancel=Cancel ${anyTO.type} any.attr.display=Attributes to be displayed bulk.action=Bulk action -any.propagation.tasks=Propagation tasks for ${type} ${key} -any.notification.tasks=Notification tasks for ${type} ${key} +any.propagation.tasks=Propagation tasks for ${type} ${name} +any.notification.tasks=Notification tasks for ${type} ${name} notification.tasks=Tasks about notification ${key} -typeExtensions=Type extensions for GROUP ${key} +typeExtensions=Type extensions for GROUP ${name} http://git-wip-us.apache.org/repos/asf/syncope/blob/81f2e00c/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_it.properties index 10cc7ec..904e53a 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_it.properties @@ -31,13 +31,13 @@ tokenNotValued=Non valorizzato subject=Oggetto recipients=Destinatari -any.edit=Modifica ${anyTO.type} ${key} +any.edit=Modifica ${anyTO.type} ${anyTO.name} any.new=Nuovo ${anyTO.type} any.attr.display=Attributi da mostrare any.finish=Invia ${anyTO.type} any.cancel=Annulla ${anyTO.type} bulk.action=Operazioni di gruppo -any.propagation.tasks=Task di propagazione per ${type} ${key} -any.notification.tasks=Task di notifica per ${type} ${key} +any.propagation.tasks=Task di propagazione per ${type} ${name} +any.notification.tasks=Task di notifica per ${type} ${name} notification.tasks=Task relativi alla notifica ${key} -typeExtensions=Type extensions per GROUP ${key} +typeExtensions=Type extensions per GROUP ${name} http://git-wip-us.apache.org/repos/asf/syncope/blob/81f2e00c/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_pt_BR.properties index dff561e..5f1fddb 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_pt_BR.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_pt_BR.properties @@ -31,13 +31,13 @@ tokenNotValued=N\u00e3o Atribu\u00eddo subject=Assunto recipients=Destinat\u00e1rios -any.edit=Alterar ${anyTO.type} ${key} +any.edit=Alterar ${anyTO.type} ${anyTO.name} any.new=Novo ${anyTO.type} any.attr.display=Atributos a ser exibido any.finish=Apresentar ${anyTO.type} any.cancel=Cancelar ${anyTO.type} bulk.action=A\u00e7\u00e3o Composta -any.propagation.tasks=Propagation tasks for ${type} ${key} -any.notification.tasks=Notification tasks for ${type} ${key} +any.propagation.tasks=Propagation tasks for ${type} ${name} +any.notification.tasks=Notification tasks for ${type} ${name} notification.tasks=Tasks about notification ${key} -typeExtensions=Type extensions for GROUP ${key} +typeExtensions=Type extensions for GROUP ${name} http://git-wip-us.apache.org/repos/asf/syncope/blob/81f2e00c/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_ru.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_ru.properties index bfa0bc2..b090fe6 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_ru.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/DirectoryPanel_ru.properties @@ -32,13 +32,13 @@ tokenNotValued=\u041e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u044 subject=\u0422\u0435\u043c\u0430 recipients=\u041f\u043e\u043b\u0443\u0447\u0430\u0442\u0435\u043b\u0438 -any.edit=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c ${anyTO.type} ${anyTO.key} +any.edit=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c ${anyTO.type} ${anyTO.name} any.new=\u0421\u043e\u0437\u0434\u0430\u0442\u044c ${anyTO.type} any.finish=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c ${anyTO.type} any.cancel=\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c ${anyTO.type} any.attr.display=\u041f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u0442\u044c \u0430\u0442\u0440\u0438\u0431\u0443\u0442\u044b bulk.action=\u041c\u0430\u0441\u0441\u043e\u0432\u043e\u0435 \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435 -any.propagation.tasks=\u0417\u0430\u0434\u0430\u0447\u0438 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0439 \u0434\u043b\u044f ${type} ${key} -any.notification.tasks=\u0417\u0430\u0434\u0430\u0447\u0438 \u043e\u0442\u043f\u0440\u0430\u0432\u043a\u0438 \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0439 \u0434\u043b\u044f ${type} ${key} +any.propagation.tasks=\u0417\u0430\u0434\u0430\u0447\u0438 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0439 \u0434\u043b\u044f ${type} ${name} +any.notification.tasks=\u0417\u0430\u0434\u0430\u0447\u0438 \u043e\u0442\u043f\u0440\u0430\u0432\u043a\u0438 \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0439 \u0434\u043b\u044f ${type} ${name} notification.tasks=\u0417\u0430\u0434\u0430\u0447\u0438 \u043e\u0442\u043f\u0440\u0430\u0432\u043a\u0438 \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0439 ${key} -typeExtensions=\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u044f \u0442\u0438\u043f\u0430 \u0434\u043b\u044f \u0413\u0440\u0443\u043f\u043f\u044b ${key} +typeExtensions=\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u0438\u044f \u0442\u0438\u043f\u0430 \u0434\u043b\u044f \u0413\u0440\u0443\u043f\u043f\u044b ${name} http://git-wip-us.apache.org/repos/asf/syncope/blob/81f2e00c/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel.properties index 2812ae6..ebae232 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel.properties @@ -15,3 +15,5 @@ # specific language governing permissions and limitations # under the License. any.edit=Edit ${anyTO.type} ${anyTO.username} +any.propagation.tasks=Propagation tasks for ${type} ${username} +any.notification.tasks=Notification tasks for ${type} ${username} http://git-wip-us.apache.org/repos/asf/syncope/blob/81f2e00c/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_it.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_it.properties index 981d6ad..6295415 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_it.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_it.properties @@ -15,3 +15,5 @@ # specific language governing permissions and limitations # under the License. any.edit=Modifica ${anyTO.type} ${anyTO.username} +any.propagation.tasks=Task di propagazione per ${type} ${name} +any.notification.tasks=Task di notifica per ${type} ${username} http://git-wip-us.apache.org/repos/asf/syncope/blob/81f2e00c/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_pt_BR.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_pt_BR.properties index 993254d..9ef0ad9 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_pt_BR.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_pt_BR.properties @@ -15,3 +15,5 @@ # specific language governing permissions and limitations # under the License. any.edit=Alterar ${anyTO.type} ${anyTO.username} +any.propagation.tasks=Propagation tasks for ${type} ${name} +any.notification.tasks=Notification tasks for ${type} ${username} http://git-wip-us.apache.org/repos/asf/syncope/blob/81f2e00c/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_ru.properties ---------------------------------------------------------------------- diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_ru.properties index a2154e5..ad11a87 100644 --- a/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_ru.properties +++ b/client/console/src/main/resources/org/apache/syncope/client/console/panels/UserDirectoryPanel_ru.properties @@ -16,3 +16,5 @@ # under the License. # any.edit=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c ${anyTO.type} ${anyTO.username} +any.propagation.tasks=\u0417\u0430\u0434\u0430\u0447\u0438 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0439 \u0434\u043b\u044f ${type} ${username} +any.notification.tasks=\u0417\u0430\u0434\u0430\u0447\u0438 \u043e\u0442\u043f\u0440\u0430\u0432\u043a\u0438 \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0439 \u0434\u043b\u044f ${type} ${username}
