From efca52b8d690816f3f84b1fe08a4c99c5ceab64d Mon Sep 17 00:00:00 2001 From: honchar Date: Fri, 24 Mar 2017 11:44:37 +0100 Subject: [PATCH 1/7] added icon for already assigned roles on the role catalog page --- .../web/component/data/MultiButtonTable.html | 4 ++++ .../web/component/data/MultiButtonTable.java | 14 +++++++++++++- .../resources/localization/Midpoint.properties | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.html index a4ec9adbc41..dec879ab7ff 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.html @@ -29,6 +29,10 @@
+
+ +
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java index 4b7e46d7ce4..3b6894fb528 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MultiButtonTable.java @@ -48,6 +48,7 @@ public class MultiButtonTable extends BasePanel> { private static final String ID_INNER = "inner"; private static final String ID_INNER_LABEL = "innerLabel"; private static final String ID_TYPE_ICON = "typeIcon"; + private static final String ID_ALREADY_ASSIGNED_ICON = "alreadyAssignedIcon"; private static final String ID_ADD_TO_CART_LINK = "addToCartLink"; private static final String ID_ADD_TO_CART_LINK_LABEL = "addToCartLinkLabel"; private static final String ID_ADD_TO_CART_LINK_ICON = "addToCartLinkIcon"; @@ -211,6 +212,17 @@ public boolean isEnabled(){ icon.add(new AttributeAppender("class", getIconClass(assignment.getType()))); cellContainer.add(icon); + WebMarkupContainer alreadyAssignedIcon = new WebMarkupContainer(ID_ALREADY_ASSIGNED_ICON); + alreadyAssignedIcon.add(new VisibleEnableBehaviour(){ + private static final long serialVersionUID = 1L; + + @Override + public boolean isVisible(){ + return assignment.isAlreadyAssigned(); + } + }); + cellContainer.add(alreadyAssignedIcon); + } private boolean canAssign(final AssignmentEditorDto assignment) { @@ -241,7 +253,7 @@ private String getIconClass(AssignmentEditorDtoType type){ } private String getBackgroundClass(AssignmentEditorDto dto){ - if (dto.isAlreadyAssigned()){ + if (!canAssign(dto)){ return GuiStyleConstants.CLASS_DISABLED_OBJECT_ROLE_BG; } else if (AssignmentEditorDtoType.ROLE.equals(dto.getType())){ return GuiStyleConstants.CLASS_OBJECT_ROLE_BG; diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties index d718ab3488b..c6e1f49090d 100644 --- a/gui/admin-gui/src/main/resources/localization/Midpoint.properties +++ b/gui/admin-gui/src/main/resources/localization/Midpoint.properties @@ -3415,6 +3415,7 @@ MultiButtonPanel.plusIconTitle=Add item to shopping cart MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details MultiButtonPanel.detailsLink=Details MultiButtonPanel.addToCartLink=Add to cart +MultiButtonPanel.alreadyAssignedIconTitle=Already assigned PageAssignmentDetails.title=Assignment details PageAssignmentDetails.backButton=Back PageAssignmentDetails.addToCartButton=Add to cart From 87d984bca374df60c6347ae864eebd0388e6c804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Ga=C5=A1par=C3=ADk?= Date: Fri, 24 Mar 2017 13:00:29 +0100 Subject: [PATCH 2/7] Translations, update. WIP --- .../localization/Midpoint_ar.properties | 17 ++- .../localization/Midpoint_cs.properties | 21 ++-- .../localization/Midpoint_de.properties | 17 ++- .../localization/Midpoint_en.properties | 13 ++- .../localization/Midpoint_es.properties | 17 ++- .../localization/Midpoint_es_AR.properties | 17 ++- .../localization/Midpoint_et.properties | 47 ++++---- .../localization/Midpoint_hi.properties | 17 ++- .../localization/Midpoint_hu.properties | 17 ++- .../localization/Midpoint_pl.properties | 21 ++-- .../localization/Midpoint_pt_BR.properties | 17 ++- .../localization/Midpoint_ru.properties | 31 ++++-- .../localization/Midpoint_sk.properties | 17 ++- .../localization/Midpoint_tr.properties | 17 ++- .../localization/schema_hu.properties | 102 +++++++++--------- 15 files changed, 257 insertions(+), 131 deletions(-) diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties index 2fd1957bb6d..63a31e9a53b 100644 --- a/gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties +++ b/gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties @@ -1149,6 +1149,8 @@ PageBase.clearCssCache=Clear less/js cache pageBase.midPointVersion=${pom.version}, ${git.describe} pageBase.unknownBuildNumber=unknown PageBase.subscriptionMessage=Non-subscription. +PageBase.nonActiveSubscriptionMessage=No active subscription. Please support midPoint by purchasing a subscription. +PageBase.demoSubscriptionMessage=Demo subscription. PageBulkAction.async=Asynchronous PageBulkAction.button.start=Start PageBulkAction.message.emptyString=Inserted bulk action is empty. Please provide non-empty script. @@ -2962,7 +2964,7 @@ PageAdmin.menu.assignments=Assignments PageAdmin.menu.credentials=Credentials PageAdmin.menu.request=Request a role PageTemplate.version=Version\: -PageTemplate.copy=Copyright © 2010-2016 Evolveum and partners. Thank you for using midPoint +PageTemplate.copy=Copyright © 2010-2017 Evolveum® and partners.  PageTemplate.toggleNavigation=Toggle navigation PageTemplate.user=user PageTemplate.couldntNavigateBreadcrumb=Couldn't navigate breadcrumb, reason\: {0} @@ -3080,6 +3082,9 @@ ScenePanel.item=Item ScenePanel.oldValue=Old value ScenePanel.newValue=New value ScenePanel.value=Value +SceneItemLinePanel.removedValue=Removed value +SceneItemLinePanel.addedValue=Added value +SceneItemLinePanel.unchangedValue=Unchanged value operation.com.evolveum.midpoint.web.page.admin.resources.ResourceContentTabPanel.changeOwner=Change owner (GUI) TaskSummaryPanel.progressWithTotalKnown=Progress\: {0} out of {1} TaskSummaryPanel.progressWithTotalUnknown=Progress\: {0} @@ -3150,6 +3155,7 @@ MainObjectListPanel.refresh=Refresh MainObjectListPanel.newObject=New MainObjectListPanel.import=Import MainObjectListPanel.export=Export +MainObjectListPanel.exportFileName=export TreeTablePanel.menu.createMember=Create member TreeTablePanel.menu.createManager=Create manager TreeTablePanel.menu.addMembers=Assign members @@ -3361,8 +3367,8 @@ PageAssignmentConflicts.back=Back PageAssignmentConflicts.submit=Submit AssignmentCatalogPanel.selectTargetUser=Select target user AssignmentCatalogPanel.selectAssignmentsUserOwner=Select assignments user owner -AssignmentCatalogPanel.requestForMe=Request for me -AssignmentCatalogPanel.requestFor=Request for +AssignmentCatalogPanel.requestForMe=Target user\: me +AssignmentCatalogPanel.requestFor=Target user\: AssignmentCatalogPanel.assignmentsOwner={0}'s assignments MultiButtonPanel.plusIconTitle=Add item to shopping cart MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details @@ -3374,6 +3380,7 @@ PageAssignmentDetails.addToCartButton=Add to cart PageAssignmentsList.submitButton=Submit PageAssignmentsList.resolveConflicts=Resolve conflicts PageAssignmentsList.commentHere=Comment here... +PageAssignmentsList.requestComment=Request comment (optional) AssignmentShoppingCartPanel.treeTitle=Role catalog AssignmentViewType.ROLE_CATALOG_VIEW=Role catalog view AssignmentViewType.ROLE_TYPE=All roles view @@ -3480,7 +3487,9 @@ PageResetPasswordConfirmation.confirmation.error=Reset password is not allowed. PageResetPasswordConfirmation.authnetication.failed=Incorrect username and/or password ItemPathSegmentPanel.itemToSearch=Search for {0} DecisionDto.automaticallyApproved=(automatically approved) -DecisionDto.automaticallyRejected=(automatically approved) +DecisionDto.automaticallyRejected=(automatically rejected) +DecisionDto.approvedDueToTimeout=(approved due to the timeout) +DecisionDto.rejectedDueToTimeout=(rejected due to the timeout) DecisionDto.AUTO_APPROVAL_CONDITION=(auto-approval condition) DecisionDto.NO_APPROVERS_FOUND=(no approvers found) wf.object=Object diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties index 1432d90b091..29a2897ccf6 100644 --- a/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties +++ b/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties @@ -1149,6 +1149,8 @@ PageBase.clearCssCache=Vyčistit less/js cache pageBase.midPointVersion=${pom.version}, ${git.describe} pageBase.unknownBuildNumber=neznámý PageBase.subscriptionMessage=Bez placené podpory. +PageBase.nonActiveSubscriptionMessage=Bez placené podpory. Placená podpora poskytuje prioritní řešení oprav a vylepšení a umožňuje další rozvoj midPointu. +PageBase.demoSubscriptionMessage=Ukázková verze. PageBulkAction.async=Asynchronní PageBulkAction.button.start=Spustit PageBulkAction.message.emptyString=Vložená hronadná akce je prázdná. Vložte neprázdný skript. @@ -1883,7 +1885,7 @@ pageTask.boundHelp=Úlohy s pevnou vazbou jsou používány pro krátké a čast pageTask.bound=Pevná vazba (použijte pokud je opakování úlohy časté) pageTask.browse=Prohlížet pageTask.category.BulkActions=Hromadné akce -pageTask.category.Demo=Demo +pageTask.category.Demo=Ukázka pageTask.category.ImportFromFile=Importovat ze souboru pageTask.category.ImportingAccounts=Importování účtů pageTask.category.LiveSynchronization=Live synchronizace @@ -2014,7 +2016,7 @@ pageTasks.category.AllCategories=Všechny kategorie pageTasks.category.BulkActions=Hromadné akce pageTasks.category=Kategorie pageTasks.category.Cleanup=Vyčistit -pageTasks.category.Demo=Demo +pageTasks.category.Demo=Ukázka pageTasks.category.ImportFromFile=Import ze souboru pageTasks.category.ImportingAccounts=Importované účty pageTasks.category.LiveSynchronization=Live synchronizace @@ -2962,7 +2964,7 @@ PageAdmin.menu.assignments=Přiřazení PageAdmin.menu.credentials=Změna hesla PageAdmin.menu.request=Požádat o roli PageTemplate.version=Verze\: -PageTemplate.copy=Copyright © 2010-2016 Evolveum a partneři. Děkujeme vám, že používáte midPoint. +PageTemplate.copy=Copyright © 2010-2017 Evolveum® a partneři.  PageTemplate.toggleNavigation=Přepnout navigaci PageTemplate.user=uživatel PageTemplate.couldntNavigateBreadcrumb=Nelze procházet navigaci, důvod\: {0} @@ -3080,6 +3082,9 @@ ScenePanel.item=Položky ScenePanel.oldValue=Stará hodnota ScenePanel.newValue=Nová hodnota ScenePanel.value=Hodnota +SceneItemLinePanel.removedValue=Odebraná hodnota +SceneItemLinePanel.addedValue=Přidaná hodnota +SceneItemLinePanel.unchangedValue=Nezměněná hodnota operation.com.evolveum.midpoint.web.page.admin.resources.ResourceContentTabPanel.changeOwner=Změnit vlastníka (GUI) TaskSummaryPanel.progressWithTotalKnown=Zpracování\: {0} z {1} TaskSummaryPanel.progressWithTotalUnknown=Zpracování\: {0} @@ -3150,6 +3155,7 @@ MainObjectListPanel.refresh=Aktualizovat MainObjectListPanel.newObject=Nový MainObjectListPanel.import=Importovat MainObjectListPanel.export=Export +MainObjectListPanel.exportFileName=export TreeTablePanel.menu.createMember=Vytvořit člena TreeTablePanel.menu.createManager=Vytvořit manažera TreeTablePanel.menu.addMembers=Přiřadit členy @@ -3361,8 +3367,8 @@ PageAssignmentConflicts.back=Zpět PageAssignmentConflicts.submit=Odeslat AssignmentCatalogPanel.selectTargetUser=Vybrat cílového uživatele AssignmentCatalogPanel.selectAssignmentsUserOwner=Vybrat vlastníka přiřazení uživatele -AssignmentCatalogPanel.requestForMe=Požadavek na mě -AssignmentCatalogPanel.requestFor=Požadavek pro +AssignmentCatalogPanel.requestForMe=Cílový uživatel\: já +AssignmentCatalogPanel.requestFor=Cílový uživatel\: AssignmentCatalogPanel.assignmentsOwner=Přiřazení identity {0} MultiButtonPanel.plusIconTitle=Přidat položku do nákupního košíku MultiButtonPanel.assignmentDetailsPopupTitle=Podrobnosti přiřazení @@ -3374,6 +3380,7 @@ PageAssignmentDetails.addToCartButton=Přidat do košíku PageAssignmentsList.submitButton=Odeslat PageAssignmentsList.resolveConflicts=Rozhodnout konflikty PageAssignmentsList.commentHere=Poznámka +PageAssignmentsList.requestComment=Poznámka k žádosti (volitelná) AssignmentShoppingCartPanel.treeTitle=Katalog rolí AssignmentViewType.ROLE_CATALOG_VIEW=Zobrazení katalogu rolí AssignmentViewType.ROLE_TYPE=Zobrazení všech rolí @@ -3480,7 +3487,9 @@ PageResetPasswordConfirmation.confirmation.error=Reset hesla není povolen. Je t PageResetPasswordConfirmation.authnetication.failed=Nesprávné uživatelské jméno nebo heslo. ItemPathSegmentPanel.itemToSearch=Hledání pro {0} DecisionDto.automaticallyApproved=(automaticky schváleno) -DecisionDto.automaticallyRejected=(automaticky schváleno) +DecisionDto.automaticallyRejected=(automaticky odmítnuto) +DecisionDto.approvedDueToTimeout=(schváleno automaticky po uplynutí lhůty) +DecisionDto.rejectedDueToTimeout=(zamítnuto automaticky po uplynutí lhůty) DecisionDto.AUTO_APPROVAL_CONDITION=(podmínečné samoschválení) DecisionDto.NO_APPROVERS_FOUND=(nenalezeni žádní schvalovatelé) wf.object=Objekt diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_de.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_de.properties index 8869e4548d7..ba80423d32b 100644 --- a/gui/admin-gui/src/main/resources/localization/Midpoint_de.properties +++ b/gui/admin-gui/src/main/resources/localization/Midpoint_de.properties @@ -1149,6 +1149,8 @@ PageBase.clearCssCache=Clear less/js cache pageBase.midPointVersion=${pom.version}, ${git.describe} pageBase.unknownBuildNumber=unbekannt PageBase.subscriptionMessage=Non-subscription. +PageBase.nonActiveSubscriptionMessage=No active subscription. Please support midPoint by purchasing a subscription. +PageBase.demoSubscriptionMessage=Demo subscription. PageBulkAction.async=Asynchronous PageBulkAction.button.start=Start PageBulkAction.message.emptyString=Inserted bulk action is empty. Please provide non-empty script. @@ -2962,7 +2964,7 @@ PageAdmin.menu.assignments=Zuweisungen PageAdmin.menu.credentials=Zugangsdaten PageAdmin.menu.request=Rolle beantragen PageTemplate.version=Version\: -PageTemplate.copy=Copyright © 2010-2016 Evolveum und Partner. Danke, dass Sie midPoint verwenden. +PageTemplate.copy=Copyright © 2010-2017 Evolveum® and partners.  PageTemplate.toggleNavigation=Navi ein/abschalten PageTemplate.user=Benutzer PageTemplate.couldntNavigateBreadcrumb=Couldn't navigate breadcrumb, reason\: {0} @@ -3080,6 +3082,9 @@ ScenePanel.item=Element ScenePanel.oldValue=Alter Wert ScenePanel.newValue=Neuer Wert ScenePanel.value=Wert +SceneItemLinePanel.removedValue=Removed value +SceneItemLinePanel.addedValue=Added value +SceneItemLinePanel.unchangedValue=Unchanged value operation.com.evolveum.midpoint.web.page.admin.resources.ResourceContentTabPanel.changeOwner=Change owner (GUI) TaskSummaryPanel.progressWithTotalKnown=Progress\: {0} out of {1} TaskSummaryPanel.progressWithTotalUnknown=Progress\: {0} @@ -3150,6 +3155,7 @@ MainObjectListPanel.refresh=Aktualisieren MainObjectListPanel.newObject=Neu MainObjectListPanel.import=Importieren MainObjectListPanel.export=Export +MainObjectListPanel.exportFileName=export TreeTablePanel.menu.createMember=Benutzer anlegen TreeTablePanel.menu.createManager=Manager anlegen TreeTablePanel.menu.addMembers=Mitglieder zuweisen @@ -3361,8 +3367,8 @@ PageAssignmentConflicts.back=Back PageAssignmentConflicts.submit=Submit AssignmentCatalogPanel.selectTargetUser=Select target user AssignmentCatalogPanel.selectAssignmentsUserOwner=Select assignments user owner -AssignmentCatalogPanel.requestForMe=Request for me -AssignmentCatalogPanel.requestFor=Request for +AssignmentCatalogPanel.requestForMe=Target user\: me +AssignmentCatalogPanel.requestFor=Target user\: AssignmentCatalogPanel.assignmentsOwner={0}'s assignments MultiButtonPanel.plusIconTitle=Add item to shopping cart MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details @@ -3374,6 +3380,7 @@ PageAssignmentDetails.addToCartButton=Add to cart PageAssignmentsList.submitButton=Submit PageAssignmentsList.resolveConflicts=Resolve conflicts PageAssignmentsList.commentHere=Comment here... +PageAssignmentsList.requestComment=Request comment (optional) AssignmentShoppingCartPanel.treeTitle=Role catalog AssignmentViewType.ROLE_CATALOG_VIEW=Role catalog view AssignmentViewType.ROLE_TYPE=All roles view @@ -3480,7 +3487,9 @@ PageResetPasswordConfirmation.confirmation.error=Reset password is not allowed. PageResetPasswordConfirmation.authnetication.failed=Incorrect username and/or password ItemPathSegmentPanel.itemToSearch=Search for {0} DecisionDto.automaticallyApproved=(automatically approved) -DecisionDto.automaticallyRejected=(automatically approved) +DecisionDto.automaticallyRejected=(automatically rejected) +DecisionDto.approvedDueToTimeout=(approved due to the timeout) +DecisionDto.rejectedDueToTimeout=(rejected due to the timeout) DecisionDto.AUTO_APPROVAL_CONDITION=(auto-approval condition) DecisionDto.NO_APPROVERS_FOUND=(no approvers found) wf.object=Object diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties index e2ef3bf6375..b76b3b88aa6 100644 --- a/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties +++ b/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties @@ -1149,6 +1149,8 @@ PageBase.clearCssCache=Clear less/js cache pageBase.midPointVersion=${pom.version}, ${git.describe} pageBase.unknownBuildNumber=unknown PageBase.subscriptionMessage=Non-subscription. +PageBase.nonActiveSubscriptionMessage=No active subscription. Please support midPoint by purchasing a subscription. +PageBase.demoSubscriptionMessage=Demo subscription. PageBulkAction.async=Asynchronous PageBulkAction.button.start=Start PageBulkAction.message.emptyString=Inserted bulk action is empty. Please provide non-empty script. @@ -3080,6 +3082,9 @@ ScenePanel.item=Item ScenePanel.oldValue=Old value ScenePanel.newValue=New value ScenePanel.value=Value +SceneItemLinePanel.removedValue=Removed value +SceneItemLinePanel.addedValue=Added value +SceneItemLinePanel.unchangedValue=Unchanged value operation.com.evolveum.midpoint.web.page.admin.resources.ResourceContentTabPanel.changeOwner=Change owner (GUI) TaskSummaryPanel.progressWithTotalKnown=Progress\: {0} out of {1} TaskSummaryPanel.progressWithTotalUnknown=Progress\: {0} @@ -3150,6 +3155,7 @@ MainObjectListPanel.refresh=Refresh MainObjectListPanel.newObject=New MainObjectListPanel.import=Import MainObjectListPanel.export=Export +MainObjectListPanel.exportFileName=export TreeTablePanel.menu.createMember=Create member TreeTablePanel.menu.createManager=Create manager TreeTablePanel.menu.addMembers=Assign members @@ -3361,8 +3367,8 @@ PageAssignmentConflicts.back=Back PageAssignmentConflicts.submit=Submit AssignmentCatalogPanel.selectTargetUser=Select target user AssignmentCatalogPanel.selectAssignmentsUserOwner=Select assignments user owner -AssignmentCatalogPanel.requestForMe=Target user: me -AssignmentCatalogPanel.requestFor=Target user: +AssignmentCatalogPanel.requestForMe=Target user\: me +AssignmentCatalogPanel.requestFor=Target user\: AssignmentCatalogPanel.assignmentsOwner={0}'s assignments MultiButtonPanel.plusIconTitle=Add item to shopping cart MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details @@ -3374,6 +3380,7 @@ PageAssignmentDetails.addToCartButton=Add to cart PageAssignmentsList.submitButton=Submit PageAssignmentsList.resolveConflicts=Resolve conflicts PageAssignmentsList.commentHere=Comment here... +PageAssignmentsList.requestComment=Request comment (optional) AssignmentShoppingCartPanel.treeTitle=Role catalog AssignmentViewType.ROLE_CATALOG_VIEW=Role catalog view AssignmentViewType.ROLE_TYPE=All roles view @@ -3481,6 +3488,8 @@ PageResetPasswordConfirmation.authnetication.failed=Incorrect username and/or pa ItemPathSegmentPanel.itemToSearch=Search for {0} DecisionDto.automaticallyApproved=(automatically approved) DecisionDto.automaticallyRejected=(automatically rejected) +DecisionDto.approvedDueToTimeout=(approved due to the timeout) +DecisionDto.rejectedDueToTimeout=(rejected due to the timeout) DecisionDto.AUTO_APPROVAL_CONDITION=(auto-approval condition) DecisionDto.NO_APPROVERS_FOUND=(no approvers found) wf.object=Object diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_es.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_es.properties index 00d3f80922a..5fc667dc732 100644 --- a/gui/admin-gui/src/main/resources/localization/Midpoint_es.properties +++ b/gui/admin-gui/src/main/resources/localization/Midpoint_es.properties @@ -1149,6 +1149,8 @@ PageBase.clearCssCache=Limpiar el cache less/js pageBase.midPointVersion=${pom.version}, ${git.describe} pageBase.unknownBuildNumber=unknown PageBase.subscriptionMessage=Non-subscription. +PageBase.nonActiveSubscriptionMessage=No active subscription. Please support midPoint by purchasing a subscription. +PageBase.demoSubscriptionMessage=Demo subscription. PageBulkAction.async=Asíncrono PageBulkAction.button.start=Iniciar PageBulkAction.message.emptyString=La acción de llenado está vacía. Por favor provea un script no vacío. @@ -2962,7 +2964,7 @@ PageAdmin.menu.assignments=Asignaciones PageAdmin.menu.credentials=Credenciales PageAdmin.menu.request=Request a role PageTemplate.version=Version\: -PageTemplate.copy=Copyright © 2010-2016 Evolveum and partners. Thank you for using midPoint +PageTemplate.copy=Copyright © 2010-2017 Evolveum® and partners.  PageTemplate.toggleNavigation=Toggle navigation PageTemplate.user=user PageTemplate.couldntNavigateBreadcrumb=Couldn't navigate breadcrumb, reason\: {0} @@ -3080,6 +3082,9 @@ ScenePanel.item=Item ScenePanel.oldValue=Old value ScenePanel.newValue=New value ScenePanel.value=Valor +SceneItemLinePanel.removedValue=Removed value +SceneItemLinePanel.addedValue=Added value +SceneItemLinePanel.unchangedValue=Unchanged value operation.com.evolveum.midpoint.web.page.admin.resources.ResourceContentTabPanel.changeOwner=Change owner (GUI) TaskSummaryPanel.progressWithTotalKnown=Progress\: {0} out of {1} TaskSummaryPanel.progressWithTotalUnknown=Progress\: {0} @@ -3150,6 +3155,7 @@ MainObjectListPanel.refresh=Refresh MainObjectListPanel.newObject=New MainObjectListPanel.import=Importar MainObjectListPanel.export=Export +MainObjectListPanel.exportFileName=export TreeTablePanel.menu.createMember=Create member TreeTablePanel.menu.createManager=Create manager TreeTablePanel.menu.addMembers=Assign members @@ -3361,8 +3367,8 @@ PageAssignmentConflicts.back=Back PageAssignmentConflicts.submit=Submit AssignmentCatalogPanel.selectTargetUser=Select target user AssignmentCatalogPanel.selectAssignmentsUserOwner=Select assignments user owner -AssignmentCatalogPanel.requestForMe=Request for me -AssignmentCatalogPanel.requestFor=Request for +AssignmentCatalogPanel.requestForMe=Target user\: me +AssignmentCatalogPanel.requestFor=Target user\: AssignmentCatalogPanel.assignmentsOwner={0}'s assignments MultiButtonPanel.plusIconTitle=Add item to shopping cart MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details @@ -3374,6 +3380,7 @@ PageAssignmentDetails.addToCartButton=Add to cart PageAssignmentsList.submitButton=Submit PageAssignmentsList.resolveConflicts=Resolve conflicts PageAssignmentsList.commentHere=Comment here... +PageAssignmentsList.requestComment=Request comment (optional) AssignmentShoppingCartPanel.treeTitle=Role catalog AssignmentViewType.ROLE_CATALOG_VIEW=Role catalog view AssignmentViewType.ROLE_TYPE=All roles view @@ -3480,7 +3487,9 @@ PageResetPasswordConfirmation.confirmation.error=Reset password is not allowed. PageResetPasswordConfirmation.authnetication.failed=Incorrect username and/or password ItemPathSegmentPanel.itemToSearch=Search for {0} DecisionDto.automaticallyApproved=(automatically approved) -DecisionDto.automaticallyRejected=(automatically approved) +DecisionDto.automaticallyRejected=(automatically rejected) +DecisionDto.approvedDueToTimeout=(approved due to the timeout) +DecisionDto.rejectedDueToTimeout=(rejected due to the timeout) DecisionDto.AUTO_APPROVAL_CONDITION=(auto-approval condition) DecisionDto.NO_APPROVERS_FOUND=(no approvers found) wf.object=Object diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties index 624f2a7509e..b76b3b88aa6 100644 --- a/gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties +++ b/gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties @@ -1149,6 +1149,8 @@ PageBase.clearCssCache=Clear less/js cache pageBase.midPointVersion=${pom.version}, ${git.describe} pageBase.unknownBuildNumber=unknown PageBase.subscriptionMessage=Non-subscription. +PageBase.nonActiveSubscriptionMessage=No active subscription. Please support midPoint by purchasing a subscription. +PageBase.demoSubscriptionMessage=Demo subscription. PageBulkAction.async=Asynchronous PageBulkAction.button.start=Start PageBulkAction.message.emptyString=Inserted bulk action is empty. Please provide non-empty script. @@ -2962,7 +2964,7 @@ PageAdmin.menu.assignments=Assignments PageAdmin.menu.credentials=Credentials PageAdmin.menu.request=Request a role PageTemplate.version=Version\: -PageTemplate.copy=Copyright © 2010-2016 Evolveum and partners. Thank you for using midPoint +PageTemplate.copy=Copyright © 2010-2017 Evolveum® and partners.  PageTemplate.toggleNavigation=Toggle navigation PageTemplate.user=user PageTemplate.couldntNavigateBreadcrumb=Couldn't navigate breadcrumb, reason\: {0} @@ -3080,6 +3082,9 @@ ScenePanel.item=Item ScenePanel.oldValue=Old value ScenePanel.newValue=New value ScenePanel.value=Value +SceneItemLinePanel.removedValue=Removed value +SceneItemLinePanel.addedValue=Added value +SceneItemLinePanel.unchangedValue=Unchanged value operation.com.evolveum.midpoint.web.page.admin.resources.ResourceContentTabPanel.changeOwner=Change owner (GUI) TaskSummaryPanel.progressWithTotalKnown=Progress\: {0} out of {1} TaskSummaryPanel.progressWithTotalUnknown=Progress\: {0} @@ -3150,6 +3155,7 @@ MainObjectListPanel.refresh=Refresh MainObjectListPanel.newObject=New MainObjectListPanel.import=Import MainObjectListPanel.export=Export +MainObjectListPanel.exportFileName=export TreeTablePanel.menu.createMember=Create member TreeTablePanel.menu.createManager=Create manager TreeTablePanel.menu.addMembers=Assign members @@ -3361,8 +3367,8 @@ PageAssignmentConflicts.back=Back PageAssignmentConflicts.submit=Submit AssignmentCatalogPanel.selectTargetUser=Select target user AssignmentCatalogPanel.selectAssignmentsUserOwner=Select assignments user owner -AssignmentCatalogPanel.requestForMe=Request for me -AssignmentCatalogPanel.requestFor=Request for +AssignmentCatalogPanel.requestForMe=Target user\: me +AssignmentCatalogPanel.requestFor=Target user\: AssignmentCatalogPanel.assignmentsOwner={0}'s assignments MultiButtonPanel.plusIconTitle=Add item to shopping cart MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details @@ -3374,6 +3380,7 @@ PageAssignmentDetails.addToCartButton=Add to cart PageAssignmentsList.submitButton=Submit PageAssignmentsList.resolveConflicts=Resolve conflicts PageAssignmentsList.commentHere=Comment here... +PageAssignmentsList.requestComment=Request comment (optional) AssignmentShoppingCartPanel.treeTitle=Role catalog AssignmentViewType.ROLE_CATALOG_VIEW=Role catalog view AssignmentViewType.ROLE_TYPE=All roles view @@ -3480,7 +3487,9 @@ PageResetPasswordConfirmation.confirmation.error=Reset password is not allowed. PageResetPasswordConfirmation.authnetication.failed=Incorrect username and/or password ItemPathSegmentPanel.itemToSearch=Search for {0} DecisionDto.automaticallyApproved=(automatically approved) -DecisionDto.automaticallyRejected=(automatically approved) +DecisionDto.automaticallyRejected=(automatically rejected) +DecisionDto.approvedDueToTimeout=(approved due to the timeout) +DecisionDto.rejectedDueToTimeout=(rejected due to the timeout) DecisionDto.AUTO_APPROVAL_CONDITION=(auto-approval condition) DecisionDto.NO_APPROVERS_FOUND=(no approvers found) wf.object=Object diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_et.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_et.properties index 1903ec9011b..dbfc4189a09 100644 --- a/gui/admin-gui/src/main/resources/localization/Midpoint_et.properties +++ b/gui/admin-gui/src/main/resources/localization/Midpoint_et.properties @@ -238,10 +238,10 @@ PageDebugView.xmlYamlButton=YAML DecisionsPanel.comment=Kommentaar DecisionsPanel.result=Tulemus DecisionsPanel.user=Kasutaja -DecisionsPanel.originalActor=Original actor +DecisionsPanel.originalActor=Algne teostaja DecisionsPanel.stage=Etapp DecisionsPanel.when=Kuupäev -DecisionsPanel.escalation=Esc. level +DecisionsPanel.escalation=Laiendustase DefinitionScopeObjectType.FocusType=Kasutajad, rollid, organisatsioonid ja teenused DefinitionScopeObjectType.AbstractRoleType=Rollid, org-d ja teenused DefinitionScopeObjectType.RoleType=Rollid @@ -1149,6 +1149,8 @@ PageBase.clearCssCache=Tühjenda less/js vahemälu pageBase.midPointVersion=${pom.version}, ${git.describe} pageBase.unknownBuildNumber=tundmatu PageBase.subscriptionMessage=Non-subscription. +PageBase.nonActiveSubscriptionMessage=Aktiivne tellimus puudub. Palun toeta midPointi, ostes tellimuse. +PageBase.demoSubscriptionMessage=Demotellimus. PageBulkAction.async=Asünkroonne PageBulkAction.button.start=Käivita PageBulkAction.message.emptyString=Sisestatud hulgitoiming on tühi. Palun esita mittetühi skript. @@ -2181,9 +2183,9 @@ pageWorkItem.requester.description=Taotleja pageWorkItem.requestSpecific.description=Sinu otsus workItemPanel.originallyAllocatedTo=Algselt eraldatud kasutajale\: workItemPanel.currentlyAllocatedTo=Hetkel eraldatud kasutajale\: -workItemPanel.candidateActors=Candidate actors\: +workItemPanel.candidateActors=Teostaja kandidaadid\: workItemPanel.stage=Kinnitusetapp\: -workItemPanel.escalationLevel=Escalation level\: +workItemPanel.escalationLevel=Laiendustase\: workItemPanel.requesterComment=Taotleja kommentaar\: workItemPanel.delta=Kinnitatav delta workItemPanel.mainInfo=Põhiteave @@ -2943,7 +2945,7 @@ Wizard.correctErrorsFirst=Palun paranda vead enne salvestamist. Wizard.Issues=Probleemid Wizard.Notes=Märkused WizardStep.title= -WorkItemsPanel.actors=Actor(s) +WorkItemsPanel.actors=Teostaja(d) WorkItemsPanel.object=Objekt WorkItemsPanel.target=Sihtmärk WorkItemsPanel.name=Nimi @@ -2951,7 +2953,7 @@ WorkItemsPanel.stage=Etapp WorkItemsPanel.started=Protsess käivitatud WorkItemsPanel.created=Loodud WorkItemsPanel.deadline=Tähtaeg -WorkItemsPanel.escalationLevel=Esc. level +WorkItemsPanel.escalationLevel=Laiendustase PageAdmin.menu.dashboard=Töölaud PageAdmin.menu.selfDashboard=Kodu PageAdmin.menu.selfService=ISETEENINDUS @@ -2962,7 +2964,7 @@ PageAdmin.menu.assignments=Omistused PageAdmin.menu.credentials=Identimisteave PageAdmin.menu.request=Taotle roll PageTemplate.version=Versioon\: -PageTemplate.copy=Autoriõigus © 2010-2016 Evolveum ja partnerid. Täname, et kasutad midPointi +PageTemplate.copy=Copyright © 2010-2017 Evolveum® and partners.  PageTemplate.toggleNavigation=Toggle navigation PageTemplate.user=kasutaja PageTemplate.couldntNavigateBreadcrumb=Couldn't navigate breadcrumb, reason\: {0} @@ -3018,7 +3020,7 @@ SearchPanel.more=Rohkem... SearchPanel.add=Lisa SearchPanel.close=Sulge SearchPanel.properties=Atribuudid -SearchPanel.fullText=Full text +SearchPanel.fullText=Täistekst SearchPanel.fullTextSearch=Täistekstiotsing SearchItemPanel.all=Kõik SearchItemPanel.update=Uuenda @@ -3080,6 +3082,9 @@ ScenePanel.item=Üksus ScenePanel.oldValue=Vana väärtus ScenePanel.newValue=Uus väärtus ScenePanel.value=Väärtus +SceneItemLinePanel.removedValue=Removed value +SceneItemLinePanel.addedValue=Added value +SceneItemLinePanel.unchangedValue=Unchanged value operation.com.evolveum.midpoint.web.page.admin.resources.ResourceContentTabPanel.changeOwner=Muuda omanikku (GUI) TaskSummaryPanel.progressWithTotalKnown=Edenemine\: {0} (kokku {1}) TaskSummaryPanel.progressWithTotalUnknown=Edenemine\: {0} @@ -3149,7 +3154,8 @@ PageRequestRole.title=Taotle roll MainObjectListPanel.refresh=Värskenda MainObjectListPanel.newObject=Uus MainObjectListPanel.import=Impordi -MainObjectListPanel.export=Export +MainObjectListPanel.export=Ekspordi +MainObjectListPanel.exportFileName=export TreeTablePanel.menu.createMember=Loo liige TreeTablePanel.menu.createManager=Loo juht TreeTablePanel.menu.addMembers=Omista liikmed @@ -3359,10 +3365,10 @@ AssignmentConflictPanel.undoAction=Võta tagasi PageAssignmentConflicts.title=Omistuste konfliktid PageAssignmentConflicts.back=Tagasi PageAssignmentConflicts.submit=Edasta -AssignmentCatalogPanel.selectTargetUser=Select target user +AssignmentCatalogPanel.selectTargetUser=Vali sihtkasutaja AssignmentCatalogPanel.selectAssignmentsUserOwner=Select assignments user owner -AssignmentCatalogPanel.requestForMe=Request for me -AssignmentCatalogPanel.requestFor=Request for +AssignmentCatalogPanel.requestForMe=Sihtkasutaja\: mina +AssignmentCatalogPanel.requestFor=Sihtkasutaja\: AssignmentCatalogPanel.assignmentsOwner={0} omistused MultiButtonPanel.plusIconTitle=Lisa objekt ostukorvi MultiButtonPanel.assignmentDetailsPopupTitle=Omistuse üksikasjad @@ -3374,11 +3380,12 @@ PageAssignmentDetails.addToCartButton=Lisa korvi PageAssignmentsList.submitButton=Edasta PageAssignmentsList.resolveConflicts=Lahenda konfliktid PageAssignmentsList.commentHere=Lisa siia kommentaar... +PageAssignmentsList.requestComment=Taotluse kommentaar (valikuline) AssignmentShoppingCartPanel.treeTitle=Rollikataloog AssignmentViewType.ROLE_CATALOG_VIEW=Rollikataloogi vaade -AssignmentViewType.ROLE_TYPE=All roles view -AssignmentViewType.ORG_TYPE=All organizations view -AssignmentViewType.SERVICE_TYPE=All services view +AssignmentViewType.ROLE_TYPE=Kõikide rollide vaade +AssignmentViewType.ORG_TYPE=Kõikide organisatsioonide vaade +AssignmentViewType.SERVICE_TYPE=Kõikide teenuste vaade AssignmentViewType.USER_TYPE=Kasutaja omistused PageAssignmentsList.requestButton = Taotle operation.com.evolveum.midpoint.web.page.self.PageAssignmentsList.requestAssignments=Taotluse omistus @@ -3480,7 +3487,9 @@ PageResetPasswordConfirmation.confirmation.error=Parooli lähtestamine pole luba PageResetPasswordConfirmation.authnetication.failed=Vale kasutajanimi ja/või parool ItemPathSegmentPanel.itemToSearch=Otsitav {0} DecisionDto.automaticallyApproved=(kinnitatud automaatselt) -DecisionDto.automaticallyRejected=(kinnitatud automaatselt) +DecisionDto.automaticallyRejected=(automatically rejected) +DecisionDto.approvedDueToTimeout=(approved due to the timeout) +DecisionDto.rejectedDueToTimeout=(rejected due to the timeout) DecisionDto.AUTO_APPROVAL_CONDITION=(auto-approval condition) DecisionDto.NO_APPROVERS_FOUND=(kinnitajaid ei leitud) wf.object=Objekt @@ -3491,8 +3500,8 @@ wf.stageNumber=Etapi number wf.stageCount=Etapi arv wf.stageName=Etapi nimi wf.stageDisplayName=Etapi kuvatav nimi -wf.escalationLevelNumber=Escalation level number -wf.escalationLevelName=Escalation level name -wf.escalationLevelDisplayName=Escalation level display name +wf.escalationLevelNumber=Laiendustaseme number +wf.escalationLevelName=Laiendustaseme nimi +wf.escalationLevelDisplayName=Laiendustaseme kuvatav nimi wf.workItemId=Tööüksuse ID wf.processInstanceId=Protsessi eksemplari ID diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties index 624f2a7509e..b76b3b88aa6 100644 --- a/gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties +++ b/gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties @@ -1149,6 +1149,8 @@ PageBase.clearCssCache=Clear less/js cache pageBase.midPointVersion=${pom.version}, ${git.describe} pageBase.unknownBuildNumber=unknown PageBase.subscriptionMessage=Non-subscription. +PageBase.nonActiveSubscriptionMessage=No active subscription. Please support midPoint by purchasing a subscription. +PageBase.demoSubscriptionMessage=Demo subscription. PageBulkAction.async=Asynchronous PageBulkAction.button.start=Start PageBulkAction.message.emptyString=Inserted bulk action is empty. Please provide non-empty script. @@ -2962,7 +2964,7 @@ PageAdmin.menu.assignments=Assignments PageAdmin.menu.credentials=Credentials PageAdmin.menu.request=Request a role PageTemplate.version=Version\: -PageTemplate.copy=Copyright © 2010-2016 Evolveum and partners. Thank you for using midPoint +PageTemplate.copy=Copyright © 2010-2017 Evolveum® and partners.  PageTemplate.toggleNavigation=Toggle navigation PageTemplate.user=user PageTemplate.couldntNavigateBreadcrumb=Couldn't navigate breadcrumb, reason\: {0} @@ -3080,6 +3082,9 @@ ScenePanel.item=Item ScenePanel.oldValue=Old value ScenePanel.newValue=New value ScenePanel.value=Value +SceneItemLinePanel.removedValue=Removed value +SceneItemLinePanel.addedValue=Added value +SceneItemLinePanel.unchangedValue=Unchanged value operation.com.evolveum.midpoint.web.page.admin.resources.ResourceContentTabPanel.changeOwner=Change owner (GUI) TaskSummaryPanel.progressWithTotalKnown=Progress\: {0} out of {1} TaskSummaryPanel.progressWithTotalUnknown=Progress\: {0} @@ -3150,6 +3155,7 @@ MainObjectListPanel.refresh=Refresh MainObjectListPanel.newObject=New MainObjectListPanel.import=Import MainObjectListPanel.export=Export +MainObjectListPanel.exportFileName=export TreeTablePanel.menu.createMember=Create member TreeTablePanel.menu.createManager=Create manager TreeTablePanel.menu.addMembers=Assign members @@ -3361,8 +3367,8 @@ PageAssignmentConflicts.back=Back PageAssignmentConflicts.submit=Submit AssignmentCatalogPanel.selectTargetUser=Select target user AssignmentCatalogPanel.selectAssignmentsUserOwner=Select assignments user owner -AssignmentCatalogPanel.requestForMe=Request for me -AssignmentCatalogPanel.requestFor=Request for +AssignmentCatalogPanel.requestForMe=Target user\: me +AssignmentCatalogPanel.requestFor=Target user\: AssignmentCatalogPanel.assignmentsOwner={0}'s assignments MultiButtonPanel.plusIconTitle=Add item to shopping cart MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details @@ -3374,6 +3380,7 @@ PageAssignmentDetails.addToCartButton=Add to cart PageAssignmentsList.submitButton=Submit PageAssignmentsList.resolveConflicts=Resolve conflicts PageAssignmentsList.commentHere=Comment here... +PageAssignmentsList.requestComment=Request comment (optional) AssignmentShoppingCartPanel.treeTitle=Role catalog AssignmentViewType.ROLE_CATALOG_VIEW=Role catalog view AssignmentViewType.ROLE_TYPE=All roles view @@ -3480,7 +3487,9 @@ PageResetPasswordConfirmation.confirmation.error=Reset password is not allowed. PageResetPasswordConfirmation.authnetication.failed=Incorrect username and/or password ItemPathSegmentPanel.itemToSearch=Search for {0} DecisionDto.automaticallyApproved=(automatically approved) -DecisionDto.automaticallyRejected=(automatically approved) +DecisionDto.automaticallyRejected=(automatically rejected) +DecisionDto.approvedDueToTimeout=(approved due to the timeout) +DecisionDto.rejectedDueToTimeout=(rejected due to the timeout) DecisionDto.AUTO_APPROVAL_CONDITION=(auto-approval condition) DecisionDto.NO_APPROVERS_FOUND=(no approvers found) wf.object=Object diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties index 01655e56c8b..55f59bd93bd 100644 --- a/gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties +++ b/gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties @@ -1149,6 +1149,8 @@ PageBase.clearCssCache=Clear less/js cache pageBase.midPointVersion=${pom.version}, ${git.describe} pageBase.unknownBuildNumber=unknown PageBase.subscriptionMessage=Non-subscription. +PageBase.nonActiveSubscriptionMessage=No active subscription. Please support midPoint by purchasing a subscription. +PageBase.demoSubscriptionMessage=Demo subscription. PageBulkAction.async=Asynchronous PageBulkAction.button.start=Start PageBulkAction.message.emptyString=Inserted bulk action is empty. Please provide non-empty script. @@ -2962,7 +2964,7 @@ PageAdmin.menu.assignments=Assignments PageAdmin.menu.credentials=Credentials PageAdmin.menu.request=Request a role PageTemplate.version=Version\: -PageTemplate.copy=Copyright © 2010-2016 Evolveum and partners. Thank you for using midPoint +PageTemplate.copy=Copyright © 2010-2017 Evolveum® and partners.  PageTemplate.toggleNavigation=Toggle navigation PageTemplate.user=user PageTemplate.couldntNavigateBreadcrumb=Couldn't navigate breadcrumb, reason\: {0} @@ -3080,6 +3082,9 @@ ScenePanel.item=Item ScenePanel.oldValue=Old value ScenePanel.newValue=New value ScenePanel.value=Value +SceneItemLinePanel.removedValue=Removed value +SceneItemLinePanel.addedValue=Added value +SceneItemLinePanel.unchangedValue=Unchanged value operation.com.evolveum.midpoint.web.page.admin.resources.ResourceContentTabPanel.changeOwner=Change owner (GUI) TaskSummaryPanel.progressWithTotalKnown=Progress\: {0} out of {1} TaskSummaryPanel.progressWithTotalUnknown=Progress\: {0} @@ -3150,6 +3155,7 @@ MainObjectListPanel.refresh=Refresh MainObjectListPanel.newObject=New MainObjectListPanel.import=Import MainObjectListPanel.export=Export +MainObjectListPanel.exportFileName=export TreeTablePanel.menu.createMember=Create member TreeTablePanel.menu.createManager=Create manager TreeTablePanel.menu.addMembers=Assign members @@ -3361,8 +3367,8 @@ PageAssignmentConflicts.back=Back PageAssignmentConflicts.submit=Submit AssignmentCatalogPanel.selectTargetUser=Select target user AssignmentCatalogPanel.selectAssignmentsUserOwner=Select assignments user owner -AssignmentCatalogPanel.requestForMe=Request for me -AssignmentCatalogPanel.requestFor=Request for +AssignmentCatalogPanel.requestForMe=Target user\: me +AssignmentCatalogPanel.requestFor=Target user\: AssignmentCatalogPanel.assignmentsOwner={0}'s assignments MultiButtonPanel.plusIconTitle=Add item to shopping cart MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details @@ -3374,6 +3380,7 @@ PageAssignmentDetails.addToCartButton=Add to cart PageAssignmentsList.submitButton=Submit PageAssignmentsList.resolveConflicts=Resolve conflicts PageAssignmentsList.commentHere=Comment here... +PageAssignmentsList.requestComment=Request comment (optional) AssignmentShoppingCartPanel.treeTitle=Role catalog AssignmentViewType.ROLE_CATALOG_VIEW=Role catalog view AssignmentViewType.ROLE_TYPE=All roles view @@ -3480,7 +3487,9 @@ PageResetPasswordConfirmation.confirmation.error=Reset password is not allowed. PageResetPasswordConfirmation.authnetication.failed=Incorrect username and/or password ItemPathSegmentPanel.itemToSearch=Search for {0} DecisionDto.automaticallyApproved=(automatically approved) -DecisionDto.automaticallyRejected=(automatically approved) +DecisionDto.automaticallyRejected=(automatically rejected) +DecisionDto.approvedDueToTimeout=(approved due to the timeout) +DecisionDto.rejectedDueToTimeout=(rejected due to the timeout) DecisionDto.AUTO_APPROVAL_CONDITION=(auto-approval condition) DecisionDto.NO_APPROVERS_FOUND=(no approvers found) wf.object=Object diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties index f306ce1dc4c..384771a5dbf 100644 --- a/gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties +++ b/gui/admin-gui/src/main/resources/localization/Midpoint_pl.properties @@ -1149,6 +1149,8 @@ PageBase.clearCssCache=Wyczyść pamięć podręczną less/js pageBase.midPointVersion=${pom.version}, ${git.describe} pageBase.unknownBuildNumber=nieznany PageBase.subscriptionMessage=Brak subskrypcji +PageBase.nonActiveSubscriptionMessage=Brak aktywnej subskrypcji. Prosimy o wsparcie midPointa zakupując subskrypcję. +PageBase.demoSubscriptionMessage=Subskrypcja demo. PageBulkAction.async=Asynchroniczny PageBulkAction.button.start=Rozpocznij PageBulkAction.message.emptyString=Wprowadzone działania masowe są puste. Proszę podać skrypt który nie jest pusty. @@ -1262,7 +1264,7 @@ PageCertCampaign.table.reviewedAt=Zrecenzowano o PageCertCampaign.table.reviewedBy=Zrecenzowano przez PageCertCampaign.table.reviewedInStage=Na etapie PageCertCampaign.table.targetName=Cel -PageCertCampaign.table.conflictingTargetName=Conflicting +PageCertCampaign.table.conflictingTargetName=Kolidujący PageCertCampaign.noReviewers=(żaden) PageCertCampaign.time=Czas PageCertCampaign.title=Kampania certyfikacji dostępu @@ -1291,7 +1293,7 @@ PageCertDecisions.table.decision=Decyzja PageCertDecisions.table.objectName=Obiekt PageCertDecisions.table.requested=Wnioskowany PageCertDecisions.table.targetName=Cel -PageCertDecisions.table.conflictingTargetName=Conflicting +PageCertDecisions.table.conflictingTargetName=Kolidujący PageCertDecisions.table.targetType=Typ PageCertDecisions.title=Moje decyzje do podjęcia PageCertDefinition.basicInformation=Informacje podstawowe @@ -2962,7 +2964,7 @@ PageAdmin.menu.assignments=Przypisania PageAdmin.menu.credentials=Zmiana hasła PageAdmin.menu.request=Wnioskuj o rolę PageTemplate.version=Wersja\: -PageTemplate.copy=Copyright © 2010-2016 Evolveum and partners. Dziękujemy za używanie midPoint +PageTemplate.copy=Copyright © 2010-2017 Evolveum® and partners.  PageTemplate.toggleNavigation=Odwróć nawigację PageTemplate.user=użytkownik PageTemplate.couldntNavigateBreadcrumb=Nie można użyć nawigacji breadcrumb, powód\: {0} @@ -3080,6 +3082,9 @@ ScenePanel.item=Pozycja ScenePanel.oldValue=Poprzednia wartość ScenePanel.newValue=Nowa wartość ScenePanel.value=Wartość +SceneItemLinePanel.removedValue=Removed value +SceneItemLinePanel.addedValue=Added value +SceneItemLinePanel.unchangedValue=Unchanged value operation.com.evolveum.midpoint.web.page.admin.resources.ResourceContentTabPanel.changeOwner=Zmień właściciela (GUI) TaskSummaryPanel.progressWithTotalKnown=Postęp\: {0} z {1} TaskSummaryPanel.progressWithTotalUnknown=Postęp\: {0} @@ -3150,6 +3155,7 @@ MainObjectListPanel.refresh=Odśwież MainObjectListPanel.newObject=Nowy MainObjectListPanel.import=Import MainObjectListPanel.export=Eksport +MainObjectListPanel.exportFileName=Eksport TreeTablePanel.menu.createMember=Utwórz członka TreeTablePanel.menu.createManager=Utwórz menedżera TreeTablePanel.menu.addMembers=Przypisz członków @@ -3361,8 +3367,8 @@ PageAssignmentConflicts.back=Wstecz PageAssignmentConflicts.submit=Prześlij AssignmentCatalogPanel.selectTargetUser=Wybierz docelowego użytkownika AssignmentCatalogPanel.selectAssignmentsUserOwner=Wybierz właściciela przypisań użytkownika -AssignmentCatalogPanel.requestForMe=Wnioskuj dla mnie -AssignmentCatalogPanel.requestFor=Wniosek dla +AssignmentCatalogPanel.requestForMe=Docelowy użytkownik\: ja +AssignmentCatalogPanel.requestFor=Docelowy użytkownik\: AssignmentCatalogPanel.assignmentsOwner=przypisania {0} MultiButtonPanel.plusIconTitle=Dodaj pozycję do koszyka MultiButtonPanel.assignmentDetailsPopupTitle=Szczegóły przypisania @@ -3374,6 +3380,7 @@ PageAssignmentDetails.addToCartButton=Dodaj do koszyka PageAssignmentsList.submitButton=Prześlij PageAssignmentsList.resolveConflicts=Rozwiąż konflikty PageAssignmentsList.commentHere=Komentarz +PageAssignmentsList.requestComment=Komentarz (opcjonalnie) AssignmentShoppingCartPanel.treeTitle=Katalog ról AssignmentViewType.ROLE_CATALOG_VIEW=Widok katalogu ról AssignmentViewType.ROLE_TYPE=Widok wszystkich ról @@ -3480,7 +3487,9 @@ PageResetPasswordConfirmation.confirmation.error=Reset hasła jest niedozwolony. PageResetPasswordConfirmation.authnetication.failed=Niewłaściwa nazwa użytkownika i/lub hasło ItemPathSegmentPanel.itemToSearch=Szukaj {0} DecisionDto.automaticallyApproved=(zatwierdzony automatycznie) -DecisionDto.automaticallyRejected=(zatwierdzony automatycznie) +DecisionDto.automaticallyRejected=(odrzucony automatycznie) +DecisionDto.approvedDueToTimeout=(zatwierdzony z powodu przekroczenia limitu czasu) +DecisionDto.rejectedDueToTimeout=(odrzucony z powodu przekroczenia limitu czasu) DecisionDto.AUTO_APPROVAL_CONDITION=(warunek auto-zatwierdzania) DecisionDto.NO_APPROVERS_FOUND=(nie znaleziono zatwierdzających) wf.object=Obiekt diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties index c21c14ece23..888be3854b1 100644 --- a/gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties +++ b/gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties @@ -1149,6 +1149,8 @@ PageBase.clearCssCache=Limpar cache less/js pageBase.midPointVersion=${pom.version}, ${git.describe} pageBase.unknownBuildNumber=desconhecido PageBase.subscriptionMessage=Não subscrição. +PageBase.nonActiveSubscriptionMessage=No active subscription. Please support midPoint by purchasing a subscription. +PageBase.demoSubscriptionMessage=Demo subscription. PageBulkAction.async=Assíncrono PageBulkAction.button.start=Iniciar PageBulkAction.message.emptyString=A ação em lote inserida está vazia. Favor provisionar script não vazio. @@ -2962,7 +2964,7 @@ PageAdmin.menu.assignments=Atribuições PageAdmin.menu.credentials=Credenciais PageAdmin.menu.request=Requisitar um perfil PageTemplate.version=Versão\: -PageTemplate.copy=Copyright © 2010-2016 Evolveum and partners. Thank you for using midPoint +PageTemplate.copy=Copyright © 2010-2017 Evolveum® and partners.  PageTemplate.toggleNavigation=Alternar navegação PageTemplate.user=usuário PageTemplate.couldntNavigateBreadcrumb=Não foi possível navegar no 'breadcrumb'. Motivo\: {0} @@ -3080,6 +3082,9 @@ ScenePanel.item=Item ScenePanel.oldValue=Valor antigo ScenePanel.newValue=Novo valor ScenePanel.value=Valor +SceneItemLinePanel.removedValue=Removed value +SceneItemLinePanel.addedValue=Added value +SceneItemLinePanel.unchangedValue=Unchanged value operation.com.evolveum.midpoint.web.page.admin.resources.ResourceContentTabPanel.changeOwner=Alterar dono (GUI) TaskSummaryPanel.progressWithTotalKnown=Progresso\: {0} de {1} TaskSummaryPanel.progressWithTotalUnknown=Progresso\: {0} @@ -3150,6 +3155,7 @@ MainObjectListPanel.refresh=Atualizar MainObjectListPanel.newObject=Novo MainObjectListPanel.import=Importar MainObjectListPanel.export=Export +MainObjectListPanel.exportFileName=export TreeTablePanel.menu.createMember=Criar membro TreeTablePanel.menu.createManager=Criar gerente TreeTablePanel.menu.addMembers=Atribuir membros @@ -3361,8 +3367,8 @@ PageAssignmentConflicts.back=Back PageAssignmentConflicts.submit=Submit AssignmentCatalogPanel.selectTargetUser=Selecionar usuário alvo AssignmentCatalogPanel.selectAssignmentsUserOwner=Selecionar atribuições do usuário proprietário -AssignmentCatalogPanel.requestForMe=Requisitar para mim -AssignmentCatalogPanel.requestFor=Solicitar para +AssignmentCatalogPanel.requestForMe=Target user\: me +AssignmentCatalogPanel.requestFor=Target user\: AssignmentCatalogPanel.assignmentsOwner={0}'s atribuições MultiButtonPanel.plusIconTitle=Incluir item para carrinho de compras MultiButtonPanel.assignmentDetailsPopupTitle=Detalhes de atribuição @@ -3374,6 +3380,7 @@ PageAssignmentDetails.addToCartButton=Adicionar ao carrinho PageAssignmentsList.submitButton=Submeter PageAssignmentsList.resolveConflicts=Resolve conflicts PageAssignmentsList.commentHere=Comment here... +PageAssignmentsList.requestComment=Request comment (optional) AssignmentShoppingCartPanel.treeTitle=Catálogo de perfis AssignmentViewType.ROLE_CATALOG_VIEW=Visão do catálogo de perfis AssignmentViewType.ROLE_TYPE=Visão de todos perfis @@ -3480,7 +3487,9 @@ PageResetPasswordConfirmation.confirmation.error=Troca de senha não permitida. PageResetPasswordConfirmation.authnetication.failed=Nome de usuário e/ou senha incorreto(s) ItemPathSegmentPanel.itemToSearch=Pesquisar por {0} DecisionDto.automaticallyApproved=(aprovado automaticamente) -DecisionDto.automaticallyRejected=(aprovado automaticamente) +DecisionDto.automaticallyRejected=(automatically rejected) +DecisionDto.approvedDueToTimeout=(approved due to the timeout) +DecisionDto.rejectedDueToTimeout=(rejected due to the timeout) DecisionDto.AUTO_APPROVAL_CONDITION=(condição de auto-aprovação) DecisionDto.NO_APPROVERS_FOUND=(nenhum aprovador encontrado) wf.object=Objeto diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties index be530642be2..aba2a0239e7 100644 --- a/gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties +++ b/gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties @@ -1149,6 +1149,8 @@ PageBase.clearCssCache=Очистить кэш less/js pageBase.midPointVersion=${pom.version}, ${git.describe} pageBase.unknownBuildNumber=неизвестен PageBase.subscriptionMessage=Без подписки +PageBase.nonActiveSubscriptionMessage=No active subscription. Please support midPoint by purchasing a subscription. +PageBase.demoSubscriptionMessage=Demo subscription. PageBulkAction.async=Асинхронный PageBulkAction.button.start=Старт PageBulkAction.message.emptyString=Данные массового действия не определены. Пожалуйста, предоставьте непустой скрипт. @@ -1262,7 +1264,7 @@ PageCertCampaign.table.reviewedAt=Просмотрено PageCertCampaign.table.reviewedBy=Просмотрено кем PageCertCampaign.table.reviewedInStage=На этапе PageCertCampaign.table.targetName=Управляемая система -PageCertCampaign.table.conflictingTargetName=Conflicting +PageCertCampaign.table.conflictingTargetName=Конфликт PageCertCampaign.noReviewers=(нет) PageCertCampaign.time=Время PageCertCampaign.title=Операция по сертификации прав доступа @@ -1291,7 +1293,7 @@ PageCertDecisions.table.decision=Решение PageCertDecisions.table.objectName=Объект PageCertDecisions.table.requested=Запрошено PageCertDecisions.table.targetName=Управляемая система -PageCertDecisions.table.conflictingTargetName=Conflicting +PageCertDecisions.table.conflictingTargetName=Конфликт PageCertDecisions.table.targetType=Тип PageCertDecisions.title=Мои задания, ждущие решения PageCertDefinition.basicInformation=Основные сведения @@ -2184,7 +2186,7 @@ workItemPanel.currentlyAllocatedTo=Сейчас распределено ком workItemPanel.candidateActors=Кандидаты\: workItemPanel.stage=Этап согласования\: workItemPanel.escalationLevel=Уровень эскалации\: -workItemPanel.requesterComment=Requester comment\: +workItemPanel.requesterComment=Комментарий автора запроса\: workItemPanel.delta=Изменения, ожидающие утверждения workItemPanel.mainInfo=Основные сведения workItemPanel.options=Опции @@ -2962,7 +2964,7 @@ PageAdmin.menu.assignments=Назначения PageAdmin.menu.credentials=Учетные данные PageAdmin.menu.request=Запросить роль PageTemplate.version=Версия\n -PageTemplate.copy=Copyright © 2010-2016 Evolveum и партнеры. Спасибо за выбор midPoint +PageTemplate.copy=Copyright © 2010-2017 Evolveum® and partners.  PageTemplate.toggleNavigation=Переключить навигацию PageTemplate.user=пользователь PageTemplate.couldntNavigateBreadcrumb=Невозможно отобразить навигацию, причина\: {0} @@ -3018,8 +3020,8 @@ SearchPanel.more=Ещё SearchPanel.add=Добавить SearchPanel.close=Закрыть SearchPanel.properties=Параметры -SearchPanel.fullText=Full text -SearchPanel.fullTextSearch=Full text search +SearchPanel.fullText=Полное наименование +SearchPanel.fullTextSearch=Поиск по всем словам SearchItemPanel.all=Все SearchItemPanel.update=Обновить SearchItemPanel.close=Закрыть @@ -3080,6 +3082,9 @@ ScenePanel.item=Элемент ScenePanel.oldValue=Старое значение ScenePanel.newValue=Новое значение ScenePanel.value=Значение +SceneItemLinePanel.removedValue=Removed value +SceneItemLinePanel.addedValue=Added value +SceneItemLinePanel.unchangedValue=Unchanged value operation.com.evolveum.midpoint.web.page.admin.resources.ResourceContentTabPanel.changeOwner=Изменить владельца (GUI) TaskSummaryPanel.progressWithTotalKnown=Выполнение\: от {0} до {1} TaskSummaryPanel.progressWithTotalUnknown=Выполнение\: {0} @@ -3149,7 +3154,8 @@ PageRequestRole.title=Запросить роль MainObjectListPanel.refresh=Обновить MainObjectListPanel.newObject=Новый MainObjectListPanel.import=Импорт -MainObjectListPanel.export=Export +MainObjectListPanel.export=Экспорт +MainObjectListPanel.exportFileName=экспорт TreeTablePanel.menu.createMember=Создать участника TreeTablePanel.menu.createManager=Создать руководителя TreeTablePanel.menu.addMembers=Назначить участников @@ -3361,8 +3367,8 @@ PageAssignmentConflicts.back=Назад PageAssignmentConflicts.submit=Подтвердить AssignmentCatalogPanel.selectTargetUser=Выберите целевого пользователя AssignmentCatalogPanel.selectAssignmentsUserOwner=Выберите владельца назначения -AssignmentCatalogPanel.requestForMe=Запрос для меня -AssignmentCatalogPanel.requestFor=Запрос для +AssignmentCatalogPanel.requestForMe=Target user\: me +AssignmentCatalogPanel.requestFor=Target user\: AssignmentCatalogPanel.assignmentsOwner=Назначения {0} MultiButtonPanel.plusIconTitle=Добавить элемент в Корзину MultiButtonPanel.assignmentDetailsPopupTitle=Сведения о назначении @@ -3373,7 +3379,8 @@ PageAssignmentDetails.backButton=Назад PageAssignmentDetails.addToCartButton=Добавить в Корзину PageAssignmentsList.submitButton=Подтвердить PageAssignmentsList.resolveConflicts=Решить конфликты -PageAssignmentsList.commentHere=Comment here... +PageAssignmentsList.commentHere=Оставить комментарий... +PageAssignmentsList.requestComment=Request comment (optional) AssignmentShoppingCartPanel.treeTitle=Каталог ролей AssignmentViewType.ROLE_CATALOG_VIEW=Просмотр ролей из каталога AssignmentViewType.ROLE_TYPE=Просмотр всех ролей @@ -3480,7 +3487,9 @@ PageResetPasswordConfirmation.confirmation.error=Сброс пароля не р PageResetPasswordConfirmation.authnetication.failed=Некорректные логин и/или пароль ItemPathSegmentPanel.itemToSearch=Поиск по {0} DecisionDto.automaticallyApproved=(автоматически утверждено) -DecisionDto.automaticallyRejected=(автоматически утверждено) +DecisionDto.automaticallyRejected=(автоматически отклонено) +DecisionDto.approvedDueToTimeout=(утверждено по истечению срока) +DecisionDto.rejectedDueToTimeout=(отклонено, так как просрочено) DecisionDto.AUTO_APPROVAL_CONDITION=(условие авто-согласования) DecisionDto.NO_APPROVERS_FOUND=(согласующие не найдены) wf.object=Object diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties index 45b5e32c4a8..49ae7a327b2 100644 --- a/gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties +++ b/gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties @@ -1149,6 +1149,8 @@ PageBase.clearCssCache=Vyčistiť js cache pageBase.midPointVersion=${pom.version}, ${git.describe} pageBase.unknownBuildNumber=neznáme PageBase.subscriptionMessage=Non-subscription. +PageBase.nonActiveSubscriptionMessage=No active subscription. Please support midPoint by purchasing a subscription. +PageBase.demoSubscriptionMessage=Demo subscription. PageBulkAction.async=Asynchrónny PageBulkAction.button.start=Štart PageBulkAction.message.emptyString=Vložená bulk akcia je prázdna. Prosím vložte neprázdny skript. @@ -2962,7 +2964,7 @@ PageAdmin.menu.assignments=Priradenia PageAdmin.menu.credentials=Nastavenia PageAdmin.menu.request=Request a role PageTemplate.version=Verzia\: -PageTemplate.copy=Copyright © 2010-2016 Evolveum and partners. Thank you for using midPoint +PageTemplate.copy=Copyright © 2010-2017 Evolveum® and partners.  PageTemplate.toggleNavigation=Toggle navigation PageTemplate.user=používateľ PageTemplate.couldntNavigateBreadcrumb=Couldn't navigate breadcrumb, reason\: {0} @@ -3080,6 +3082,9 @@ ScenePanel.item=Item ScenePanel.oldValue=Old value ScenePanel.newValue=New value ScenePanel.value=Hodnota +SceneItemLinePanel.removedValue=Removed value +SceneItemLinePanel.addedValue=Added value +SceneItemLinePanel.unchangedValue=Unchanged value operation.com.evolveum.midpoint.web.page.admin.resources.ResourceContentTabPanel.changeOwner=Change owner (GUI) TaskSummaryPanel.progressWithTotalKnown=Progress\: {0} out of {1} TaskSummaryPanel.progressWithTotalUnknown=Progress\: {0} @@ -3150,6 +3155,7 @@ MainObjectListPanel.refresh=Refresh MainObjectListPanel.newObject=New MainObjectListPanel.import=Import MainObjectListPanel.export=Export +MainObjectListPanel.exportFileName=export TreeTablePanel.menu.createMember=Create member TreeTablePanel.menu.createManager=Create manager TreeTablePanel.menu.addMembers=Assign members @@ -3361,8 +3367,8 @@ PageAssignmentConflicts.back=Back PageAssignmentConflicts.submit=Submit AssignmentCatalogPanel.selectTargetUser=Select target user AssignmentCatalogPanel.selectAssignmentsUserOwner=Select assignments user owner -AssignmentCatalogPanel.requestForMe=Request for me -AssignmentCatalogPanel.requestFor=Request for +AssignmentCatalogPanel.requestForMe=Target user\: me +AssignmentCatalogPanel.requestFor=Target user\: AssignmentCatalogPanel.assignmentsOwner={0}'s assignments MultiButtonPanel.plusIconTitle=Add item to shopping cart MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details @@ -3374,6 +3380,7 @@ PageAssignmentDetails.addToCartButton=Add to cart PageAssignmentsList.submitButton=Submit PageAssignmentsList.resolveConflicts=Resolve conflicts PageAssignmentsList.commentHere=Comment here... +PageAssignmentsList.requestComment=Request comment (optional) AssignmentShoppingCartPanel.treeTitle=Role catalog AssignmentViewType.ROLE_CATALOG_VIEW=Role catalog view AssignmentViewType.ROLE_TYPE=All roles view @@ -3480,7 +3487,9 @@ PageResetPasswordConfirmation.confirmation.error=Reset password is not allowed. PageResetPasswordConfirmation.authnetication.failed=Incorrect username and/or password ItemPathSegmentPanel.itemToSearch=Search for {0} DecisionDto.automaticallyApproved=(automatically approved) -DecisionDto.automaticallyRejected=(automatically approved) +DecisionDto.automaticallyRejected=(automatically rejected) +DecisionDto.approvedDueToTimeout=(approved due to the timeout) +DecisionDto.rejectedDueToTimeout=(rejected due to the timeout) DecisionDto.AUTO_APPROVAL_CONDITION=(auto-approval condition) DecisionDto.NO_APPROVERS_FOUND=(no approvers found) wf.object=Object diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties index 48360911254..2715f828dc4 100644 --- a/gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties +++ b/gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties @@ -1149,6 +1149,8 @@ PageBase.clearCssCache=less/js önbellegini temizle pageBase.midPointVersion=${pom.version}, ${git.describe} pageBase.unknownBuildNumber=Bilinmeyen PageBase.subscriptionMessage=Non-subscription. +PageBase.nonActiveSubscriptionMessage=No active subscription. Please support midPoint by purchasing a subscription. +PageBase.demoSubscriptionMessage=Demo subscription. PageBulkAction.async=Asenkron PageBulkAction.button.start=Başlat PageBulkAction.message.emptyString=Girilen toplu işlem boş. Lütfen boş olmayan betik girin. @@ -2962,7 +2964,7 @@ PageAdmin.menu.assignments=Atamalar PageAdmin.menu.credentials=Şifre PageAdmin.menu.request=Rol talep et PageTemplate.version=Sürüm\: -PageTemplate.copy=Copyright © 2010-2016 Evolveum and partners. Thank you for using midPoint +PageTemplate.copy=Copyright © 2010-2017 Evolveum® and partners.  PageTemplate.toggleNavigation=Navigasyon aç-kapa PageTemplate.user=kullanıcı PageTemplate.couldntNavigateBreadcrumb=Adımlı navigasyon yüklenemedi, nedeni\: {0} @@ -3080,6 +3082,9 @@ ScenePanel.item=Öğe ScenePanel.oldValue=Eski değer ScenePanel.newValue=Yeni değer ScenePanel.value=Değer +SceneItemLinePanel.removedValue=Removed value +SceneItemLinePanel.addedValue=Added value +SceneItemLinePanel.unchangedValue=Unchanged value operation.com.evolveum.midpoint.web.page.admin.resources.ResourceContentTabPanel.changeOwner=Sahibi değiştir (GUI) TaskSummaryPanel.progressWithTotalKnown=ilerleme\: taplam {1} den {0} TaskSummaryPanel.progressWithTotalUnknown=İlerleme\: {0} @@ -3150,6 +3155,7 @@ MainObjectListPanel.refresh=Tazele MainObjectListPanel.newObject=Yeni MainObjectListPanel.import=İçe aktar MainObjectListPanel.export=Export +MainObjectListPanel.exportFileName=export TreeTablePanel.menu.createMember=Üye oluştur TreeTablePanel.menu.createManager=Yönetici oluştur TreeTablePanel.menu.addMembers=Üyeleri ata @@ -3361,8 +3367,8 @@ PageAssignmentConflicts.back=Back PageAssignmentConflicts.submit=Submit AssignmentCatalogPanel.selectTargetUser=Select target user AssignmentCatalogPanel.selectAssignmentsUserOwner=Select assignments user owner -AssignmentCatalogPanel.requestForMe=Request for me -AssignmentCatalogPanel.requestFor=Request for +AssignmentCatalogPanel.requestForMe=Target user\: me +AssignmentCatalogPanel.requestFor=Target user\: AssignmentCatalogPanel.assignmentsOwner={0}'s assignments MultiButtonPanel.plusIconTitle=Add item to shopping cart MultiButtonPanel.assignmentDetailsPopupTitle=Assignment details @@ -3374,6 +3380,7 @@ PageAssignmentDetails.addToCartButton=Add to cart PageAssignmentsList.submitButton=Submit PageAssignmentsList.resolveConflicts=Resolve conflicts PageAssignmentsList.commentHere=Comment here... +PageAssignmentsList.requestComment=Request comment (optional) AssignmentShoppingCartPanel.treeTitle=Role catalog AssignmentViewType.ROLE_CATALOG_VIEW=Role catalog view AssignmentViewType.ROLE_TYPE=All roles view @@ -3480,7 +3487,9 @@ PageResetPasswordConfirmation.confirmation.error=Reset password is not allowed. PageResetPasswordConfirmation.authnetication.failed=Incorrect username and/or password ItemPathSegmentPanel.itemToSearch=Search for {0} DecisionDto.automaticallyApproved=(automatically approved) -DecisionDto.automaticallyRejected=(automatically approved) +DecisionDto.automaticallyRejected=(automatically rejected) +DecisionDto.approvedDueToTimeout=(approved due to the timeout) +DecisionDto.rejectedDueToTimeout=(rejected due to the timeout) DecisionDto.AUTO_APPROVAL_CONDITION=(auto-approval condition) DecisionDto.NO_APPROVERS_FOUND=(no approvers found) wf.object=Object diff --git a/infra/schema/src/main/resources/localization/schema_hu.properties b/infra/schema/src/main/resources/localization/schema_hu.properties index ade2a394071..32ab36c80ee 100644 --- a/infra/schema/src/main/resources/localization/schema_hu.properties +++ b/infra/schema/src/main/resources/localization/schema_hu.properties @@ -18,31 +18,31 @@ # It may also contain keys for concepts that are common to the whole midPoint # AbstractRoleType.identifier=Azonosító -AbstractRoleType.policyConstraints=Policy constraints +AbstractRoleType.policyConstraints=Policy alapú megszorítások AccessCertificationCampaignStateType.CLOSED=Lezárva AccessCertificationCampaignStateType.CREATED=Létrehozva -AccessCertificationCampaignStateType.IN_REMEDIATION=In remediation -AccessCertificationCampaignStateType.IN_REVIEW_STAGE_FULL=In review stage {0} ({1}) -AccessCertificationCampaignStateType.IN_REVIEW_STAGE=In review stage -AccessCertificationCampaignStateType.REVIEW_STAGE_DONE_FULL=Done review stage {0} ({1}) -AccessCertificationCampaignStateType.REVIEW_STAGE_DONE=Review stage done -AccessCertificationResponseType.ACCEPT=Accept -AccessCertificationResponseType.REVOKE=Revoke -AccessCertificationResponseType.REDUCE=Reduce -AccessCertificationResponseType.NOT_DECIDED=Not decided -AccessCertificationResponseType.DELEGATE=Delegate -AccessCertificationResponseType.NO_RESPONSE=No response -ActivationStatusType.ARCHIVED=Archived -ActivationStatusType.DISABLED=Disabled -ActivationStatusType.ENABLED=Enabled -ActivationStatusType.null=Undefined -ActivationType.administrativeStatus=Administrative status -ActivationType.effectiveStatus=Effective status -ActivationType.enabled=Enabled -ActivationType.properties=Properties -ActivationType.title=Activation -ActivationType.validFrom=Valid from -ActivationType.validTo=Valid to +AccessCertificationCampaignStateType.IN_REMEDIATION=Kijavítás alatt +AccessCertificationCampaignStateType.IN_REVIEW_STAGE_FULL=Felülvizsgálat alatt {0} ({1}) +AccessCertificationCampaignStateType.IN_REVIEW_STAGE=Felülvizsgálat alatt +AccessCertificationCampaignStateType.REVIEW_STAGE_DONE_FULL=Felülvizsgálva {0} ({1}) +AccessCertificationCampaignStateType.REVIEW_STAGE_DONE=Felülvizsgálva +AccessCertificationResponseType.ACCEPT=Jóváhagyott +AccessCertificationResponseType.REVOKE=Visszavont +AccessCertificationResponseType.REDUCE=Csökkentett +AccessCertificationResponseType.NOT_DECIDED=Nem eldöntött +AccessCertificationResponseType.DELEGATE=Delegált +AccessCertificationResponseType.NO_RESPONSE=Válasz nélküli +ActivationStatusType.ARCHIVED=Archivált +ActivationStatusType.DISABLED=kitiltott +ActivationStatusType.ENABLED=Engedélyezett +ActivationStatusType.null=Nem definiált +ActivationType.administrativeStatus=Adminisztratív állapotban +ActivationType.effectiveStatus=Érvényes állapotban +ActivationType.enabled=Engedélyezett +ActivationType.properties=Tulajdonságok +ActivationType.title=Aktiválás +ActivationType.validFrom=Érvényes -től +ActivationType.validTo=Érvényes -ig ActivityType.FOCUS_OPERATION=Operation on focus object (repository) ActivityType.NOTIFICATIONS=Sending notifications ActivityType.PROJECTOR=Computing projections of the focus object @@ -55,7 +55,7 @@ AssignmentPolicyEnforcementType.NONE=None AssignmentPolicyEnforcementType.POSITIVE=Positive AssignmentPolicyEnforcementType.RELATIVE=Relative AssignmentType.tenant=Tenant -AssignmentType.project=Org. unit/Project +AssignmentType.project=Szerv. egység/Projekt AttributeFetchStrategyType.EXPLICIT=Explicit AttributeFetchStrategyType.IMPLICIT=Implicit AttributeFetchStrategyType.MINIMAL=Minimal @@ -253,37 +253,37 @@ SynchronizationSituationType.LINKED=Linked SynchronizationSituationType.null=Choose One SynchronizationSituationType.UNLINKED=Unlinked SynchronizationSituationType.UNMATCHED=Unmatched -ThreadStopActionType.CLOSE=Close -ThreadStopActionType.RESCHEDULE=Reschedule -ThreadStopActionType.RESTART=Restart -ThreadStopActionType.SUSPEND=Suspend +ThreadStopActionType.CLOSE=Lezárt +ThreadStopActionType.RESCHEDULE=Átütemezett +ThreadStopActionType.RESTART=Újraindított +ThreadStopActionType.SUSPEND=Felfüggesztett UserType.emailAddress=Email UserType.familyName=Vezetéknév UserType.fullName=Teljes név UserType.givenName=Keresztnév FailedOperationTypeType.ADD=Hozzáad FailedOperationTypeType.GET=Get -FailedOperationTypeType.MODIFY=Modify +FailedOperationTypeType.MODIFY=Módosítás FailedOperationTypeType.DELETE=Törlés AbstractRoleType.description=Leírás -AbstractRoleType.displayName=Display Name -TaskType.kind=Kind -TaskType.intent=Intent -TaskType.objectClass=Object Class -TaskType.executionStatus=Status -ObjectTypes.CONNECTOR=Connector -ObjectTypes.CONNECTOR_HOST=Connector host -ObjectTypes.GENERIC_OBJECT=Generic object +AbstractRoleType.displayName=Kijelzett név +TaskType.kind=Fajta +TaskType.intent=Szándék +TaskType.objectClass=Objektum osztály +TaskType.executionStatus=Állapot +ObjectTypes.CONNECTOR=Konnektor +ObjectTypes.CONNECTOR_HOST=Konnektor kiszolgáló +ObjectTypes.GENERIC_OBJECT=Általános objektum ObjectTypes.RESOURCE=Erőforrás ObjectTypes.USER=Felhasználó -ObjectTypes.OBJECT_TEMPLATE=Object template -ObjectTypes.SYSTEM_CONFIGURATION=System configuration -ObjectTypes.TASK=Task -ObjectTypes.SHADOW=Shadow -ObjectTypes.ROLE=Role -ObjectTypes.PASSWORD_POLICY=Password policy +ObjectTypes.OBJECT_TEMPLATE=Objektum sablon +ObjectTypes.SYSTEM_CONFIGURATION=Rendszer konfiguráció +ObjectTypes.TASK=Feladat +ObjectTypes.SHADOW=Árnyék +ObjectTypes.ROLE=Szerepkör +ObjectTypes.PASSWORD_POLICY=Jelszó politika ObjectTypes.NODE=Node -ObjectTypes.ORG=Org +ObjectTypes.ORG=Szervezet ObjectTypes.ABSTRACT_ROLE=Abstract role ObjectTypes.FOCUS_TYPE=Focus type ObjectTypes.REPORT=Report @@ -306,14 +306,14 @@ UserType.honorificSuffix=Honorific Suffix UserType.title=Title UserType.preferredLanguage=Preferred Language UserType.locale=Locale -UserType.timezone=Timezone -UserType.EmailAddress=Email Address -UserType.telephoneNumber=Telephone Number -UserType.employeeNumber=Employee Number -UserType.employeeType=Employee Type +UserType.timezone=Időzóna +UserType.EmailAddress=Email cím +UserType.telephoneNumber=Telefonszám +UserType.employeeNumber=Alkalmazott száma +UserType.employeeType=Alkalmazott típusa UserType.costCenter=Cost Center -UserType.organization=Organization -UserType.organizationalUnit=Organizational Unit +UserType.organization=Szervezet +UserType.organizationalUnit=Szervezeti egység UserType.locality=Locality UserType.credentials=Credentials CredentialsType.password=Jelszó From 613d91564120d7e444539642500d7bd9ce4ca863 Mon Sep 17 00:00:00 2001 From: Pavol Mederly Date: Fri, 24 Mar 2017 13:45:34 +0100 Subject: [PATCH 3/7] Trying to avoid "No focus class in lens context; inducement targeted at focus type ... will not be applied: LensContextPlaceholder" error at user login. --- .../impl/lens/LensContextPlaceholder.java | 5 +- .../impl/security/UserProfileServiceImpl.java | 2 +- .../test/resources/model-context.obsolete.xml | 936 --------------- .../src/test/resources/task.obsolete.xml | 1007 ----------------- .../impl/EntitlementConverter.java | 2 +- 5 files changed, 6 insertions(+), 1946 deletions(-) delete mode 100644 model/workflow-impl/src/test/resources/model-context.obsolete.xml delete mode 100644 model/workflow-impl/src/test/resources/task.obsolete.xml diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContextPlaceholder.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContextPlaceholder.java index 69ab206bc9f..6772397f68a 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContextPlaceholder.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensContextPlaceholder.java @@ -16,6 +16,7 @@ package com.evolveum.midpoint.model.impl.lens; import com.evolveum.midpoint.prism.PrismContext; +import com.evolveum.midpoint.prism.PrismObject; import com.evolveum.midpoint.util.DebugUtil; import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType; @@ -28,8 +29,10 @@ */ public class LensContextPlaceholder extends LensContext { - public LensContextPlaceholder(PrismContext prismContext) { + public LensContextPlaceholder(PrismObject focus, PrismContext prismContext) { super(prismContext); + createFocusContext((Class) focus.asObjectable().getClass()); + getFocusContext().setLoadedObject(focus); } @Override diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java index 47e122439a5..eecb414c819 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java @@ -195,7 +195,7 @@ private void initializePrincipalFromAssignments(MidPointPrincipal principal, Pri principal.setApplicableSecurityPolicy(securityHelper.locateSecurityPolicy(userType.asPrismObject(), systemConfiguration, task, result)); if (!userType.getAssignment().isEmpty()) { - LensContext lensContext = new LensContextPlaceholder<>(prismContext); + LensContext lensContext = new LensContextPlaceholder<>(userType.asPrismObject(), prismContext); AssignmentEvaluator.Builder builder = new AssignmentEvaluator.Builder() .repository(repositoryService) diff --git a/model/workflow-impl/src/test/resources/model-context.obsolete.xml b/model/workflow-impl/src/test/resources/model-context.obsolete.xml deleted file mode 100644 index 80a770dd882..00000000000 --- a/model/workflow-impl/src/test/resources/model-context.obsolete.xml +++ /dev/null @@ -1,936 +0,0 @@ - - - - - secondary - - - - jack - jack - - - pistol - mouth - Black Pearl - - - 2014-03-19T16:06:50.775+01:00 - - - - - - - enabled - enabled - 2014-03-19T16:06:46.254+01:00 - - - Jack Sparrow - jack sparrow - - - Jack - jack - - - Sparrow - sparrow - - - Jackie - jackie - - - Cpt. - cpt - - - PhD. - phd - - jack.sparrow@evolveum.com - 555-1234 - emp1234 - CAPTAIN - - Caribbean - caribbean - - - - - - - - - 4HXeUejV93Vd3JuIZz7sbs5bVko= - - - xCrrlENmlfgZ8CEFG5S3Ae3znOiUcCujF7OigydMsfoXHsDpUXRL0Sc1Sq0twz6FX+vToj4OSXfLNaG72l8e9Q== - - - - - - - - - jack - jack - - - Black Pearl - pistol - mouth - - - 2014-03-19T16:06:50.775+01:00 - - - - - - - enabled - enabled - 2014-03-19T16:06:46.254+01:00 - - - Jack Sparrow - jack sparrow - - - Jack - jack - - - Sparrow - sparrow - - - Jackie - jackie - - - Cpt. - cpt - - - PhD. - phd - - jack.sparrow@evolveum.com - 555-1234 - emp1234 - CAPTAIN - - Caribbean - caribbean - - - - - - - - 4HXeUejV93Vd3JuIZz7sbs5bVko= - - - xCrrlENmlfgZ8CEFG5S3Ae3znOiUcCujF7OigydMsfoXHsDpUXRL0Sc1Sq0twz6FX+vToj4OSXfLNaG72l8e9Q== - - - - - - - - - - modify - c:UserType - c0c010c0-d34d-b33f-f00d-111111111111 - - add - . - - - - - - - com.evolveum.midpoint.model.lens.ChangeExecutor.linkShadow - success - 1000000000000000071 - - com.evolveum.midpoint.repo.api.RepositoryService.modifyObject - success - - - c0c010c0-d34d-b33f-f00d-111111111111 - - - - java.util.ArrayList - [ReferenceDelta( / {.../common/common-3}linkRef, ADD)] - - - - com.evolveum.midpoint.xml.ns._public.common.common_3.UserType - - - 1000000000000000072 - - - - true - - com.evolveum.midpoint.xml.ns._public.common.common_3.UserType - c0c010c0-d34d-b33f-f00d-111111111111 - - - - - - - jack - jack - - - ri:AccountObjectClass - default - 0 - - - Jack Sparrow - jack - Caribbean - mouth - pistol - rum - Arr! - - - enabled - 2014-03-19T16:06:59.220+01:00 - - - - - - - - - 4HXeUejV93Vd3JuIZz7sbs5bVko= - - - xCrrlENmlfgZ8CEFG5S3Ae3znOiUcCujF7OigydMsfoXHsDpUXRL0Sc1Sq0twz6FX+vToj4OSXfLNaG72l8e9Q== - - - - - - - - add - c:ShadowType - - - - jack - jack - - - ri:AccountObjectClass - default - - jack - - - - 917c1454-ceaa-49f3-bbdd-7c1be6eeff6b - - - modify - c:ShadowType - 917c1454-ceaa-49f3-bbdd-7c1be6eeff6b - - replace - c:activation - - enabled - - - - replace - c:activation - - 2014-03-19T16:06:59.220+01:00 - - - - replace - c:attributes - - Jack Sparrow - - - - replace - c:attributes - - Caribbean - - - - add - c:attributes - - mouth - pistol - - - - add - c:attributes - - rum - - - - add - c:attributes - - Arr! - - - - replace - . - - 0 - - - - replace - . - - - - - - replace - c:credentials/c:password - - - - - - - 4HXeUejV93Vd3JuIZz7sbs5bVko= - - - xCrrlENmlfgZ8CEFG5S3Ae3znOiUcCujF7OigydMsfoXHsDpUXRL0Sc1Sq0twz6FX+vToj4OSXfLNaG72l8e9Q== - - - - - - - - - - add - c:ShadowType - - - - jack - jack - - - 2014-03-19T16:06:59.385+01:00 - - - - ri:AccountObjectClass - default - 0 - - - jack - Jack Sparrow - jack - Caribbean - mouth - pistol - rum - Arr! - - - enabled - 2014-03-19T16:06:59.220+01:00 - - - - - - - - - 4HXeUejV93Vd3JuIZz7sbs5bVko= - - - xCrrlENmlfgZ8CEFG5S3Ae3znOiUcCujF7OigydMsfoXHsDpUXRL0Sc1Sq0twz6FX+vToj4OSXfLNaG72l8e9Q== - - - - - - - - 917c1454-ceaa-49f3-bbdd-7c1be6eeff6b - - - com.evolveum.midpoint.model.lens.ChangeExecutor.executeDelta - success - - - 917c1454-ceaa-49f3-bbdd-7c1be6eeff6b - - - 1000000000000000073 - - com.evolveum.midpoint.task.api.Task.listSubtasksDeeply - success - - - c1142811-a8c8-497d-8cca-7fab74fe831f - - - - java.lang.Class - class com.evolveum.midpoint.task.quartzimpl.TaskQuartzImpl - - - - 1000000000000000074 - - com.evolveum.midpoint.task.api.Task.listSubtasksRaw - success - - - c1142811-a8c8-497d-8cca-7fab74fe831f - - - - java.lang.Class - class com.evolveum.midpoint.task.quartzimpl.TaskQuartzImpl - - - - 1000000000000000075 - - com.evolveum.midpoint.repo.api.RepositoryService.searchObjects - success - - - - com.evolveum.midpoint.prism.query.ObjectQuery - Q{EQUALS: parent, parent, PPV(String:1395241616809-0-1),null paging - - - - com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType - - - 1000000000000000076 - - - - com.evolveum.midpoint.task.api.TaskManager.createTaskInstance - success - - - - com.evolveum.midpoint.prism.PrismObject - task:cb031a05-3e09-4fb9-be8b-c8654ec37033(Workflow-monitoring task) - - - - 1000000000000000077 - - com.evolveum.midpoint.repo.api.RepositoryService.getObject - success - - - 00000000-0000-0000-0000-000000000002 - - - com.evolveum.midpoint.xml.ns._public.common.common_3.UserType - - - 1000000000000000078 - - - - com.evolveum.midpoint.task.api.Task.listSubtasksRaw - success - - - cb031a05-3e09-4fb9-be8b-c8654ec37033 - - - - java.lang.Class - class com.evolveum.midpoint.task.quartzimpl.TaskQuartzImpl - - - - 1000000000000000079 - - com.evolveum.midpoint.repo.api.RepositoryService.searchObjects - success - - - - com.evolveum.midpoint.prism.query.ObjectQuery - Q{EQUALS: parent, parent, PPV(String:1395241616886-0-1),null paging - - - - com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType - - - 1000000000000000080 - - - - - com.evolveum.midpoint.provisioning.api.ProvisioningService.addObject - success - - - - com.evolveum.midpoint.xml.ns._public.common.common_3.OperationProvisioningScriptsType - com.evolveum.midpoint.xml.ns._public.common.common_3.OperationProvisioningScriptsType@d1ce11b[script=[]] - - - - - com.evolveum.midpoint.prism.PrismObject - object:917c1454-ceaa-49f3-bbdd-7c1be6eeff6b(jack) - - - - - - - java.lang.Class - class com.evolveum.midpoint.provisioning.impl.ProvisioningServiceImpl - - - - 1000000000000000081 - - com.evolveum.midpoint.provisioning.ucf.api.ConnectorInstance.addObject - success - - - - com.evolveum.midpoint.prism.PrismObject - object:null(jack) - - - - [ - ] - - - 1000000000000000082 - - org.identityconnectors.framework.api.ConnectorFacade.create - success - - - ObjectClass: __ACCOUNT__ - - - - java.util.ArrayList - [Attribute: {Name=drink, Value=[rum]}, Attribute: {Name=location, Value=[Caribbean]}, Attribute: {Name=quote, Value=[Arr!]}, Attribute: {Name=fullname, Value=[Jack Sparrow]}, Attribute: {Name=__NAME__, Value=[jack]}, Attribute: {Name=weapon, Value=[pistol, mouth]}, Attribute: {Name=__PASSWORD__, Value=[org.identityconnectors.common.security.GuardedString@dae54050]}, Attribute: {Name=__ENABLE__, Value=[true]}] - - - - - - - - java.lang.Class - class org.identityconnectors.framework.impl.api.local.LocalConnectorFacadeImpl - - - - 1000000000000000083 - - - - com.evolveum.midpoint.repo.api.RepositoryService.addObject - success - - - - com.evolveum.midpoint.prism.PrismObject - object:917c1454-ceaa-49f3-bbdd-7c1be6eeff6b(jack) - - - - - com.evolveum.midpoint.repo.api.RepoAddOptions - RepoAddOptions(overwrite=false, allowUnencryptedValues=false) - - - - 1000000000000000084 - - - com.evolveum.midpoint.notifications.AccountOperationListener.notifySuccess - success - 1000000000000000085 - - com.evolveum.midpoint.repo.api.RepositoryService.listAccountShadowOwner - success - - - 917c1454-ceaa-49f3-bbdd-7c1be6eeff6b - - - 1000000000000000086 - - - - - - true - - com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType - 917c1454-ceaa-49f3-bbdd-7c1be6eeff6b - false - 0 - - - - - account - default - - false - false - true - true - false - add - false - 0 - - linked - - - com.evolveum.midpoint.xml.ns._public.common.common_3.UserType - false - 2 - 1 - false - true - true - - 2014-03-19T16:06:56.571+01:00 - - - diff --git a/model/workflow-impl/src/test/resources/task.obsolete.xml b/model/workflow-impl/src/test/resources/task.obsolete.xml deleted file mode 100644 index 1bc087f4f9f..00000000000 --- a/model/workflow-impl/src/test/resources/task.obsolete.xml +++ /dev/null @@ -1,1007 +0,0 @@ - - - - - - Workflow for processing jack (started Mar 19, 2014 2:25:28 PM) - workflow for processing jack started mar 19 2014 22528 pm - - - com.evolveum.midpoint.wf.processors.general.GeneralChangeProcessor - - secondary - - - - jack - jack - - - mouth - pistol - Black Pearl - - - 2014-03-19T14:25:19.363+01:00 - - - - - - - enabled - enabled - 2014-03-19T14:25:14.823+01:00 - - - Jack Sparrow - jack sparrow - - - Jack - jack - - - Sparrow - sparrow - - - Jackie - jackie - - - Cpt. - cpt - - - PhD. - phd - - jack.sparrow@evolveum.com - 555-1234 - emp1234 - CAPTAIN - - Caribbean - caribbean - - - - - - - - - 4HXeUejV93Vd3JuIZz7sbs5bVko= - - - X2j4W5czwkhOt9MoJi0Pups95e/FGVF8bdVwBVa8cjucGGXRZh6+je6dFjW77EaeOLPeiiy+SdBq1uVJhk3DJw== - - - - - - - - - jack - jack - - - Black Pearl - mouth - pistol - - - 2014-03-19T14:25:19.363+01:00 - - - - - - - enabled - enabled - 2014-03-19T14:25:14.823+01:00 - - - Jack Sparrow - jack sparrow - - - Jack - jack - - - Sparrow - sparrow - - - Jackie - jackie - - - Cpt. - cpt - - - PhD. - phd - - jack.sparrow@evolveum.com - 555-1234 - emp1234 - CAPTAIN - - Caribbean - caribbean - - - - - - - - 4HXeUejV93Vd3JuIZz7sbs5bVko= - - - X2j4W5czwkhOt9MoJi0Pups95e/FGVF8bdVwBVa8cjucGGXRZh6+je6dFjW77EaeOLPeiiy+SdBq1uVJhk3DJw== - - - - - - - - - - modify - c:UserType - c0c010c0-d34d-b33f-f00d-111111111111 - - add - . - - - - - - - com.evolveum.midpoint.model.lens.ChangeExecutor.linkShadow - success - 1000000000000000071 - - com.evolveum.midpoint.repo.api.RepositoryService.modifyObject - success - - - c0c010c0-d34d-b33f-f00d-111111111111 - - - - java.util.ArrayList - [ReferenceDelta( / {.../common/common-3}linkRef, ADD)] - - - - com.evolveum.midpoint.xml.ns._public.common.common_3.UserType - - - 1000000000000000072 - - - - true - - com.evolveum.midpoint.xml.ns._public.common.common_3.UserType - c0c010c0-d34d-b33f-f00d-111111111111 - - - - - - - jack - jack - - - ri:AccountObjectClass - default - 0 - - - Jack Sparrow - jack - Caribbean - mouth - pistol - rum - Arr! - - - enabled - 2014-03-19T14:25:27.590+01:00 - - - - - - - - - 4HXeUejV93Vd3JuIZz7sbs5bVko= - - - X2j4W5czwkhOt9MoJi0Pups95e/FGVF8bdVwBVa8cjucGGXRZh6+je6dFjW77EaeOLPeiiy+SdBq1uVJhk3DJw== - - - - - - - - add - c:ShadowType - - - - jack - jack - - - ri:AccountObjectClass - default - - jack - - - - e3a820c4-224b-4714-bce7-7d4855f6fa97 - - - modify - c:ShadowType - e3a820c4-224b-4714-bce7-7d4855f6fa97 - - replace - c:activation - - enabled - - - - replace - c:activation - - 2014-03-19T14:25:27.590+01:00 - - - - replace - c:attributes - - Jack Sparrow - - - - replace - c:attributes - - Caribbean - - - - add - c:attributes - - mouth - pistol - - - - add - c:attributes - - rum - - - - add - c:attributes - - Arr! - - - - replace - . - - 0 - - - - replace - . - - - - - - replace - c:credentials/c:password - - - - - - - 4HXeUejV93Vd3JuIZz7sbs5bVko= - - - X2j4W5czwkhOt9MoJi0Pups95e/FGVF8bdVwBVa8cjucGGXRZh6+je6dFjW77EaeOLPeiiy+SdBq1uVJhk3DJw== - - - - - - - - - - add - c:ShadowType - - - - jack - jack - - - 2014-03-19T14:25:27.776+01:00 - - - - ri:AccountObjectClass - default - 0 - - - jack - Jack Sparrow - jack - Caribbean - mouth - pistol - rum - Arr! - - - enabled - 2014-03-19T14:25:27.590+01:00 - - - - - - - - - 4HXeUejV93Vd3JuIZz7sbs5bVko= - - - X2j4W5czwkhOt9MoJi0Pups95e/FGVF8bdVwBVa8cjucGGXRZh6+je6dFjW77EaeOLPeiiy+SdBq1uVJhk3DJw== - - - - - - - - e3a820c4-224b-4714-bce7-7d4855f6fa97 - - - com.evolveum.midpoint.model.lens.ChangeExecutor.executeDelta - success - - - e3a820c4-224b-4714-bce7-7d4855f6fa97 - - - 1000000000000000073 - - com.evolveum.midpoint.task.api.Task.listSubtasksDeeply - success - - - ca8f5f27-df60-492a-9acc-7d53441d15ad - - - - java.lang.Class - class com.evolveum.midpoint.task.quartzimpl.TaskQuartzImpl - - - - 1000000000000000074 - - com.evolveum.midpoint.task.api.Task.listSubtasksRaw - success - - - ca8f5f27-df60-492a-9acc-7d53441d15ad - - - - java.lang.Class - class com.evolveum.midpoint.task.quartzimpl.TaskQuartzImpl - - - - 1000000000000000075 - - com.evolveum.midpoint.repo.api.RepositoryService.searchObjects - success - - - - com.evolveum.midpoint.prism.query.ObjectQuery - Q{EQUALS: parent, parent, PPV(String:1395235525301-0-1),null paging - - - - com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType - - - 1000000000000000076 - - - - com.evolveum.midpoint.task.api.TaskManager.createTaskInstance - success - - - - com.evolveum.midpoint.prism.PrismObject - task:dd0c66d2-fc23-4d63-b2ed-8f2bc983ad63(Workflow-monitoring task) - - - - 1000000000000000077 - - com.evolveum.midpoint.repo.api.RepositoryService.getObject - success - - - 00000000-0000-0000-0000-000000000002 - - - com.evolveum.midpoint.xml.ns._public.common.common_3.UserType - - - 1000000000000000078 - - - - com.evolveum.midpoint.task.api.Task.listSubtasksRaw - success - - - dd0c66d2-fc23-4d63-b2ed-8f2bc983ad63 - - - - java.lang.Class - class com.evolveum.midpoint.task.quartzimpl.TaskQuartzImpl - - - - 1000000000000000079 - - com.evolveum.midpoint.repo.api.RepositoryService.searchObjects - success - - - - com.evolveum.midpoint.prism.query.ObjectQuery - Q{EQUALS: parent, parent, PPV(String:1395235525370-0-1),null paging - - - - com.evolveum.midpoint.xml.ns._public.common.common_3.TaskType - - - 1000000000000000080 - - - - - com.evolveum.midpoint.provisioning.api.ProvisioningService.addObject - success - - - - com.evolveum.midpoint.xml.ns._public.common.common_3.OperationProvisioningScriptsType - com.evolveum.midpoint.xml.ns._public.common.common_3.OperationProvisioningScriptsType@266c2164[script=[]] - - - - - com.evolveum.midpoint.prism.PrismObject - object:e3a820c4-224b-4714-bce7-7d4855f6fa97(jack) - - - - - - - java.lang.Class - class com.evolveum.midpoint.provisioning.impl.ProvisioningServiceImpl - - - - 1000000000000000081 - - com.evolveum.midpoint.provisioning.ucf.api.ConnectorInstance.addObject - success - - - - com.evolveum.midpoint.prism.PrismObject - object:null(jack) - - - - [ - ] - - - 1000000000000000082 - - org.identityconnectors.framework.api.ConnectorFacade.create - success - - - ObjectClass: __ACCOUNT__ - - - - java.util.ArrayList - [Attribute: {Name=drink, Value=[rum]}, Attribute: {Name=location, Value=[Caribbean]}, Attribute: {Name=quote, Value=[Arr!]}, Attribute: {Name=fullname, Value=[Jack Sparrow]}, Attribute: {Name=__NAME__, Value=[jack]}, Attribute: {Name=weapon, Value=[pistol, mouth]}, Attribute: {Name=__PASSWORD__, Value=[org.identityconnectors.common.security.GuardedString@dae54050]}, Attribute: {Name=__ENABLE__, Value=[true]}] - - - - - - - - java.lang.Class - class org.identityconnectors.framework.impl.api.local.LocalConnectorFacadeImpl - - - - 1000000000000000083 - - - - com.evolveum.midpoint.repo.api.RepositoryService.addObject - success - - - - com.evolveum.midpoint.prism.PrismObject - object:e3a820c4-224b-4714-bce7-7d4855f6fa97(jack) - - - - - com.evolveum.midpoint.repo.api.RepoAddOptions - RepoAddOptions(overwrite=false, allowUnencryptedValues=false) - - - - 1000000000000000084 - - - com.evolveum.midpoint.notifications.AccountOperationListener.notifySuccess - success - 1000000000000000085 - - com.evolveum.midpoint.repo.api.RepositoryService.listAccountShadowOwner - success - - - e3a820c4-224b-4714-bce7-7d4855f6fa97 - - - 1000000000000000086 - - - - - - true - - com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType - e3a820c4-224b-4714-bce7-7d4855f6fa97 - false - 0 - - - - - account - default - - false - false - true - true - false - add - false - 0 - - linked - - - com.evolveum.midpoint.xml.ns._public.common.common_3.UserType - false - 2 - 1 - false - true - true - - 2014-03-19T14:25:25.041+01:00 - - - - 1395235528201-0-1 - - 1395235525301-0-1 - waiting - Workflow - http://midpoint.evolveum.com/xml/ns/public/model/operation/handler-3 - - com.evolveum.midpoint.task.api.Task.run - in_progress - 1000000000000000087 - - in_progress - - 0 - single - tight - diff --git a/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java b/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java index 5f4335eb573..34778c730f7 100644 --- a/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java +++ b/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/impl/EntitlementConverter.java @@ -311,7 +311,7 @@ private ObjectQuery createQuery(RefinedAssociationDefinition assocDefTyp PrismPropertyValue converted = PrismUtil.convertPropertyValue(valueAttr.getValue(0), valueAttr.getDefinition(), assocAttrDef); TA normalizedRealValue = matchingRule.normalize(converted.getValue()); PrismPropertyValue normalized = new PrismPropertyValue(normalizedRealValue); - LOGGER.trace("Converted entitlement filter: {} ({}) def={}", normalized, normalized.getValue().getClass(), assocAttrDef); + LOGGER.trace("Converted entitlement filter value: {} ({}) def={}", normalized, normalized.getValue().getClass(), assocAttrDef); ObjectQuery query = QueryBuilder.queryFor(ShadowType.class, prismContext) .item(new ItemPath(ShadowType.F_ATTRIBUTES, assocAttrDef.getName()), assocAttrDef).eq(normalized) .build(); From afb48839dc5f58d42d8f137305dd447a5cc60bae Mon Sep 17 00:00:00 2001 From: Pavol Mederly Date: Fri, 24 Mar 2017 22:22:06 +0100 Subject: [PATCH 4/7] Assignees are now recorded using identity links instead of task variable (in progress). --- .../wf/impl/activiti/dao/WorkItemManager.java | 53 +++-- .../impl/activiti/dao/WorkItemProvider.java | 182 ++++++++---------- .../common/CommonProcessVariableNames.java | 12 +- .../itemApproval/PrepareForTaskCreation.java | 13 +- .../itemApproval/ProcessVariableNames.java | 3 +- .../itemApproval/TaskCreateListener.java | 6 +- .../midpoint/wf/impl/util/MiscDataUtil.java | 56 ++---- .../src/main/resources/mybatis/Task.xml | 13 +- .../impl/policy/other/TestActivitiQuery.java | 118 ++++++++++-- .../wf/impl/policy/other/TestDelegation.java | 29 +-- 10 files changed, 283 insertions(+), 202 deletions(-) diff --git a/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java b/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java index 87c7c363a49..f369729ed26 100644 --- a/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java +++ b/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java @@ -60,11 +60,8 @@ import javax.xml.datatype.Duration; import javax.xml.datatype.XMLGregorianCalendar; import java.util.*; -import java.util.stream.Collectors; import static com.evolveum.midpoint.schema.util.ObjectTypeUtil.toShortString; -import static com.evolveum.midpoint.wf.impl.processes.common.CommonProcessVariableNames.ADDITIONAL_ASSIGNEES_PREFIX; -import static com.evolveum.midpoint.wf.impl.processes.common.CommonProcessVariableNames.ADDITIONAL_ASSIGNEES_SUFFIX; import static com.evolveum.midpoint.xml.ns._public.common.common_3.WorkItemOperationKindType.DELEGATE; import static com.evolveum.midpoint.xml.ns._public.common.common_3.WorkItemOperationKindType.ESCALATE; @@ -168,13 +165,14 @@ public void claimWorkItem(String workItemId, OperationResult parentResult) throw throw new ObjectNotFoundException("The work item does not exist"); } if (task.getAssignee() != null) { - String desc = task.getAssignee().equals(principal.getOid()) ? "the current" : "another"; + String desc = MiscDataUtil.stringToRef(task.getAssignee()).getOid().equals(principal.getOid()) ? "the current" : "another"; throw new SystemException("The work item is already assigned to "+desc+" user"); } if (!miscDataUtil.isAuthorizedToClaim(task.getId())) { throw new SecurityViolationException("You are not authorized to claim the selected work item."); } taskService.claim(workItemId, principal.getOid()); + // TODO assignees in identity links! } catch (ObjectNotFoundException|SecurityViolationException|RuntimeException e) { result.recordFatalError("Couldn't claim the work item " + workItemId + ": " + e.getMessage(), e); throw e; @@ -202,7 +200,7 @@ public void releaseWorkItem(String workItemId, OperationResult parentResult) thr if (task.getAssignee() == null) { throw new SystemException("The work item is not assigned to a user"); } - if (!task.getAssignee().equals(principal.getOid())) { + if (!MiscDataUtil.stringToRef(task.getAssignee()).getOid().equals(principal.getOid())) { throw new SystemException("The work item is not assigned to the current user"); } boolean candidateFound = false; @@ -345,23 +343,42 @@ private Date setNewDuration(String workItemId, @NotNull Duration newDuration, Ta return dueDate; } - private void setNewAssignees(Task task, List newAssignees, TaskService taskService) { - if (task.getAssignee() != null) { - boolean removed = newAssignees.removeIf(newAssignee -> task.getAssignee().equals(newAssignee.getOid())); - if (!removed) { - // we will nominate the first delegate (if present) as a new assignee - if (!newAssignees.isEmpty()) { - taskService.setAssignee(task.getId(), newAssignees.get(0).getOid()); - newAssignees.remove(0); + private void setNewAssignees(Task task, List assigneeRefList, TaskService taskService) { + List assignees = MiscDataUtil.refsToStrings(assigneeRefList); + + // check and optionally set task assignee + if (task.getAssignee() != null && !assignees.contains(task.getAssignee()) + || task.getAssignee() == null && !assignees.isEmpty()) { + // we will nominate the first delegate (if present) as a new assignee + taskService.setAssignee(task.getId(), !assignees.isEmpty() ? assignees.get(0) : null); + } + + // set task identity links + List currentLinks = taskService.getIdentityLinksForTask(task.getId()); + for (IdentityLink currentLink : currentLinks) { + if (!CommonProcessVariableNames.MIDPOINT_ASSIGNEE.equals(currentLink.getType())) { + continue; + } + String assigneeFromLink = currentLink.getUserId() != null ? currentLink.getUserId() : currentLink.getGroupId(); + if (assignees.contains(assigneeFromLink)) { + assignees.remove(assigneeFromLink); + } else { + if (currentLink.getUserId() != null) { + taskService.deleteUserIdentityLink(task.getId(), currentLink.getUserId(), CommonProcessVariableNames.MIDPOINT_ASSIGNEE); } else { - taskService.setAssignee(task.getId(), null); + taskService.deleteGroupIdentityLink(task.getId(), currentLink.getGroupId(), CommonProcessVariableNames.MIDPOINT_ASSIGNEE); } } } - String additionalAssigneesAsString = newAssignees.isEmpty() ? null : newAssignees.stream() - .map(d -> ADDITIONAL_ASSIGNEES_PREFIX + MiscDataUtil.refToString(d) + ADDITIONAL_ASSIGNEES_SUFFIX) - .collect(Collectors.joining(CommonProcessVariableNames.ADDITIONAL_ASSIGNEES_SEPARATOR)); - taskService.setVariableLocal(task.getId(), CommonProcessVariableNames.VARIABLE_ADDITIONAL_ASSIGNEES, additionalAssigneesAsString); + // process remaining assignees + for (String assignee : assignees) { + ObjectReferenceType assigneeRef = MiscDataUtil.stringToRef(assignee); + if (assigneeRef.getType() == null || QNameUtil.match(UserType.COMPLEX_TYPE, assigneeRef.getType())) { + taskService.addUserIdentityLink(task.getId(), assignee, CommonProcessVariableNames.MIDPOINT_ASSIGNEE); + } else { + taskService.addGroupIdentityLink(task.getId(), assignee, CommonProcessVariableNames.MIDPOINT_ASSIGNEE); + } + } } } diff --git a/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java b/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java index 26b24acaee2..b21a9a6f9df 100644 --- a/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java +++ b/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemProvider.java @@ -45,8 +45,6 @@ import com.evolveum.midpoint.wf.impl.processes.common.LightweightObjectRef; import com.evolveum.midpoint.wf.impl.util.MiscDataUtil; import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.OrgType; -import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType; import com.evolveum.midpoint.xml.ns._public.common.common_3.WorkItemType; import org.activiti.engine.TaskService; import org.activiti.engine.task.IdentityLink; @@ -59,16 +57,13 @@ import org.springframework.stereotype.Component; import java.util.*; -import java.util.stream.Collectors; import static com.evolveum.midpoint.schema.constants.ObjectTypes.TASK; import static com.evolveum.midpoint.schema.constants.ObjectTypes.USER; import static com.evolveum.midpoint.schema.util.ObjectQueryUtil.FilterComponents; import static com.evolveum.midpoint.schema.util.ObjectQueryUtil.factorOutQuery; import static com.evolveum.midpoint.schema.util.ObjectTypeUtil.createObjectRef; -import static com.evolveum.midpoint.wf.impl.processes.common.CommonProcessVariableNames.*; import static com.evolveum.midpoint.xml.ns._public.common.common_3.WorkItemType.*; -import static org.apache.commons.collections.CollectionUtils.addIgnoreNull; import static org.apache.commons.collections.CollectionUtils.isEmpty; import static org.apache.commons.lang3.ObjectUtils.defaultIfNull; @@ -152,12 +147,12 @@ private TaskQuery createTaskQuery(ObjectQuery query, boolean includeVariables, C } if (assigneeFilter != null) { - taskQuery = addAssignees(taskQuery, assigneeFilter); + taskQuery = addAssigneesToQuery(taskQuery, assigneeFilter); } if (candidateRolesFilter != null) { - List candidateGroups = prismReferenceValueListToGroupNames( - (Collection) candidateRolesFilter.getValue()); + // TODO what about candidate users? (currently these are not supported) + List candidateGroups = MiscDataUtil.prismRefsToStrings((Collection) candidateRolesFilter.getValue()); if (!candidateGroups.isEmpty()) { taskQuery = taskQuery.taskCandidateGroupIn(candidateGroups); } else { @@ -194,39 +189,14 @@ private TaskQuery createTaskQuery(ObjectQuery query, boolean includeVariables, C } } - private TaskQuery addAssignees(TaskQuery taskQuery, Map.Entry> assigneeFilter) { + private TaskQuery addAssigneesToQuery(TaskQuery taskQuery, Map.Entry> assigneeFilter) { @SuppressWarnings("unchecked") Collection assigneeRefs = (Collection) assigneeFilter.getValue(); if (isEmpty(assigneeRefs)) { return taskQuery.taskUnassigned(); - } - List oids = assigneeRefs.stream() - .map(PrismReferenceValue::getOid) - .collect(Collectors.toList()); - taskQuery = taskQuery.or() - .taskAssignee(StringUtils.join(oids, ';')); - for (String oid : oids) { - taskQuery = taskQuery.taskVariableValueLike( - VARIABLE_ADDITIONAL_ASSIGNEES, "%" + TYPE_NAME_SEPARATOR + oid + ADDITIONAL_ASSIGNEES_SUFFIX + "%"); - } - return taskQuery.endOr(); - } - - private List prismReferenceValueListToGroupNames(Collection refs) { - List rv = new ArrayList<>(); - for (PrismReferenceValue ref : refs) { - addIgnoreNull(rv, prismReferenceValueToGroupName(ref)); - } - return rv; - } - - private String prismReferenceValueToGroupName(PrismReferenceValue ref) { - if (RoleType.COMPLEX_TYPE.equals(ref.getTargetType())) { - return "role:" + ref.getOid(); - } else if (OrgType.COMPLEX_TYPE.equals(ref.getTargetType())) { - return "org:" + ref.getOid(); } else { - return null; + List values = MiscDataUtil.prismRefsToStrings(assigneeRefs); + return taskQuery.taskInvolvedUser(StringUtils.join(values, ';')); } } @@ -266,23 +236,15 @@ private SearchResultList tasksToWorkItems(List tasks, Map getAdditionalAssignees(Map variables, String contextDescription) { + public List getMidpointAssignees(TaskExtract taskExtract) { List rv = new ArrayList<>(); - Object o = variables.get(VARIABLE_ADDITIONAL_ASSIGNEES); - if (o instanceof String) { - String s = (String) o; - if (!s.isEmpty()) { - for (String wrappedRef : s.split(CommonProcessVariableNames.ADDITIONAL_ASSIGNEES_SEPARATOR)) { - if (!wrappedRef.startsWith(CommonProcessVariableNames.ADDITIONAL_ASSIGNEES_PREFIX) - || !wrappedRef.endsWith(ADDITIONAL_ASSIGNEES_SUFFIX)) { - throw new IllegalStateException("Wrongly-formatted '" - + VARIABLE_ADDITIONAL_ASSIGNEES + "' variable contents: '" - + o + "' in " + contextDescription); - } else { - String stringRef = wrappedRef.substring(ADDITIONAL_ASSIGNEES_PREFIX.length(), - wrappedRef.length() - ADDITIONAL_ASSIGNEES_SUFFIX.length()); - rv.add(MiscDataUtil.stringToRef(stringRef)); - } + for (IdentityLink link : taskExtract.getTaskIdentityLinks()) { + if (CommonProcessVariableNames.MIDPOINT_ASSIGNEE.equals(link.getType())) { + if (link.getUserId() != null) { + rv.add(MiscDataUtil.stringToRef(link.getUserId())); + } + if (link.getGroupId() != null) { // just for completeness (currently we don't expect groups to be here) + rv.add(MiscDataUtil.stringToRef(link.getGroupId())); } } } @@ -305,40 +267,9 @@ private class TaskExtract { private Map variables; private List candidateUsers; private List candidateGroups; + private final List taskIdentityLinks; - TaskExtract(Task task) { - id = task.getId(); - assignee = task.getAssignee(); - name = task.getName(); - processInstanceId = task.getProcessInstanceId(); - createTime = task.getCreateTime(); - dueDate = task.getDueDate(); - owner = task.getOwner(); - executionId = task.getExecutionId(); - variables = new HashMap<>(); - if (task.getProcessVariables() != null) { - variables.putAll(task.getProcessVariables()); - } - if (task.getTaskLocalVariables() != null) { - variables.putAll(task.getTaskLocalVariables()); - } - candidateUsers = new ArrayList<>(); - candidateGroups = new ArrayList<>(); - TaskService taskService = activitiEngine.getTaskService(); - for (IdentityLink link : taskService.getIdentityLinksForTask(task.getId())) { - if (IdentityLinkType.CANDIDATE.equals(link.getType())) { - if (link.getUserId() != null) { - candidateUsers.add(link.getUserId()); - } else if (link.getGroupId() != null) { - candidateGroups.add(link.getGroupId()); - } else { - throw new IllegalStateException("A link is defined to neither a user nor a group for task " + task.getId()); - } - } - } - } - - TaskExtract(TaskEvent task) { + TaskExtract(TaskEvent task, Map processVariables, List taskIdentityLinks) { id = task.getTaskId(); assignee = task.getAssigneeOid(); name = task.getTaskName(); @@ -350,25 +281,57 @@ private class TaskExtract { variables = task.getVariables(); candidateUsers = task.getCandidateUsers(); candidateGroups = task.getCandidateGroups(); + addProcessVariables(processVariables); + this.taskIdentityLinks = taskIdentityLinks; } - public TaskExtract(Task task, Map processVariables) { - this(task); - if (processVariables != null) { - for (Map.Entry variable: processVariables.entrySet()) { - if (!variables.containsKey(variable.getKey())) { - variables.put(variable.getKey(), variable.getValue()); - } - } - } - } + TaskExtract(Task task, Map processVariables, List taskIdentityLinks) { + id = task.getId(); + assignee = task.getAssignee(); + name = task.getName(); + processInstanceId = task.getProcessInstanceId(); + createTime = task.getCreateTime(); + dueDate = task.getDueDate(); + owner = task.getOwner(); + executionId = task.getExecutionId(); + variables = new HashMap<>(); + if (task.getProcessVariables() != null) { + variables.putAll(task.getProcessVariables()); + } + if (task.getTaskLocalVariables() != null) { + variables.putAll(task.getTaskLocalVariables()); + } + candidateUsers = new ArrayList<>(); + candidateGroups = new ArrayList<>(); + for (IdentityLink link : taskIdentityLinks) { + if (IdentityLinkType.CANDIDATE.equals(link.getType())) { + if (link.getUserId() != null) { + candidateUsers.add(link.getUserId()); + } else if (link.getGroupId() != null) { + candidateGroups.add(link.getGroupId()); + } + } + } + addProcessVariables(processVariables); + this.taskIdentityLinks = taskIdentityLinks; + } - String getId() { + private void addProcessVariables(Map processVariables) { + if (processVariables != null) { + for (Map.Entry variable: processVariables.entrySet()) { + if (!variables.containsKey(variable.getKey())) { + variables.put(variable.getKey(), variable.getValue()); + } + } + } + } + + String getId() { return id; } - String getAssignee() { - return assignee; + ObjectReferenceType getAssignee() { + return assignee != null ? MiscDataUtil.stringToRef(assignee) : null; } String getName() { @@ -407,7 +370,11 @@ public List getCandidateGroups() { return candidateGroups; } - @Override + public List getTaskIdentityLinks() { + return taskIdentityLinks; + } + + @Override public String toString() { return "Task{" + "id='" + id + '\'' + @@ -422,13 +389,17 @@ private WorkItemType taskToWorkItem(Task task, Map processVariab if (task == null) { return null; } - TaskExtract taskExtract = new TaskExtract(task, processVariables); + TaskExtract taskExtract = new TaskExtract(task, processVariables, getTaskIdentityLinks(task.getId())); return taskExtractToWorkItem(taskExtract, resolveTask, resolveAssignee, resolveCandidates, fetchAllVariables, result); } - public WorkItemType taskEventToWorkItemNew(TaskEvent taskEvent, Map processVariables, boolean resolveTask, + private List getTaskIdentityLinks(String taskId) { + return activitiEngine.getTaskService().getIdentityLinksForTask(taskId); + } + + public WorkItemType taskEventToWorkItemNew(TaskEvent taskEvent, Map processVariables, boolean resolveTask, boolean resolveAssignee, boolean resolveCandidates, OperationResult result) { - TaskExtract taskExtract = new TaskExtract(taskEvent); + TaskExtract taskExtract = new TaskExtract(taskEvent, processVariables, getTaskIdentityLinks(taskEvent.getTaskId())); return taskExtractToWorkItem(taskExtract, resolveTask, resolveAssignee, resolveCandidates, false, result); } @@ -459,10 +430,7 @@ public WorkItemType taskExtractToWorkItem(TaskExtract task, boolean resolveTask, } // assignees - if (task.getAssignee() != null) { - wi.getAssigneeRef().add(createObjectRef(task.getAssignee(), USER)); - } - wi.getAssigneeRef().addAll(getAdditionalAssignees(variables, "task " + task.getId())); + wi.getAssigneeRef().addAll(getMidpointAssignees(task)); String originalAssigneeString = ActivitiUtil.getVariable(variables, CommonProcessVariableNames.VARIABLE_ORIGINAL_ASSIGNEE, String.class, prismContext); if (originalAssigneeString != null) { @@ -475,7 +443,7 @@ public WorkItemType taskExtractToWorkItem(TaskExtract task, boolean resolveTask, // candidates task.getCandidateUsers().forEach(s -> wi.getCandidateRef().add(createObjectRef(s, USER))); - task.getCandidateGroups().forEach(s -> wi.getCandidateRef().add(miscDataUtil.groupIdToObjectReference(s))); + task.getCandidateGroups().forEach(s -> wi.getCandidateRef().add(MiscDataUtil.stringToRef(s))); if (resolveCandidates) { miscDataUtil.resolveAndStoreObjectReferences(wi.getCandidateRef(), result); } diff --git a/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/CommonProcessVariableNames.java b/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/CommonProcessVariableNames.java index 19f9b6fab95..91c140271af 100644 --- a/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/CommonProcessVariableNames.java +++ b/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/common/CommonProcessVariableNames.java @@ -123,15 +123,9 @@ public class CommonProcessVariableNames { // [SafeSerializationContainer of List] public static final String ADDITIONAL_INFORMATION = "additionalInformation"; - // Additional assignees, if any. [String] - // Formatted as type:OID - public static final String VARIABLE_ADDITIONAL_ASSIGNEES = "additionalAssignees"; - public static final String ADDITIONAL_ASSIGNEES_SEPARATOR = ";"; - public static final String ADDITIONAL_ASSIGNEES_PREFIX = "["; - public static final String ADDITIONAL_ASSIGNEES_SUFFIX = "]"; - // Original assignee, if any. [String] // Formatted as type:OID + // (Note that assignee itself is formatted like this since 3.6) public static final String VARIABLE_ORIGINAL_ASSIGNEE = "originalAssignee"; public static final String TYPE_NAME_SEPARATOR = ":"; @@ -143,4 +137,8 @@ public class CommonProcessVariableNames { // Who completed this work item (OID of the user) // [String] public static final String VARIABLE_WORK_ITEM_COMPLETED_BY = "workItemCompletedBy"; + + // Identity link type to denote an assignee. MidPoint uses it (instead of assignee), because we need to have potentially + // more than one assignee + public static final String MIDPOINT_ASSIGNEE = "midpoint-assignee"; } diff --git a/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareForTaskCreation.java b/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareForTaskCreation.java index 2b1f13742ff..89697012a91 100644 --- a/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareForTaskCreation.java +++ b/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/PrepareForTaskCreation.java @@ -21,6 +21,7 @@ import com.evolveum.midpoint.schema.result.OperationResult; import com.evolveum.midpoint.task.api.Task; import com.evolveum.midpoint.util.DOMUtil; +import com.evolveum.midpoint.util.QNameUtil; import com.evolveum.midpoint.util.exception.SystemException; import com.evolveum.midpoint.util.logging.Trace; import com.evolveum.midpoint.util.logging.TraceManager; @@ -56,12 +57,12 @@ public void execute(DelegateExecution execution) { String assignee = null; String candidateGroups = null; - if (approverRef.getType() == null || UserType.COMPLEX_TYPE.equals(approverRef.getType())) { - assignee = approverRef.getOid(); - } else if (RoleType.COMPLEX_TYPE.equals(approverRef.getType())) { - candidateGroups = MiscDataUtil.ROLE_PREFIX + ":" + approverRef.getOid(); - } else if (OrgType.COMPLEX_TYPE.equals(approverRef.getType())) { - candidateGroups = MiscDataUtil.ORG_PREFIX + ":" + approverRef.getOid(); + if (approverRef.getType() == null || QNameUtil.match(UserType.COMPLEX_TYPE, approverRef.getType())) { + assignee = MiscDataUtil.refToString(new ObjectReferenceType().oid(approverRef.getOid()).type(UserType.COMPLEX_TYPE)); + } else if (QNameUtil.match(RoleType.COMPLEX_TYPE, approverRef.getType()) || + QNameUtil.match(OrgType.COMPLEX_TYPE, approverRef.getType()) || + QNameUtil.match(ServiceType.COMPLEX_TYPE, approverRef.getType())) { + candidateGroups = MiscDataUtil.refToString(approverRef.toObjectReferenceType()); } else { throw new IllegalStateException("Unsupported type of the approver: " + approverRef.getType()); } diff --git a/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ProcessVariableNames.java b/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ProcessVariableNames.java index dfc77c90ca2..ae59c31a28a 100644 --- a/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ProcessVariableNames.java +++ b/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/ProcessVariableNames.java @@ -45,7 +45,8 @@ public class ProcessVariableNames { // Oid of the approver if approverRef is a user (in that case, the task is assigned directly to the user) public static final String ASSIGNEE = "assignee"; - // Oid of the abstract role if approverRef is an abstract role (in that case, it is used as a candidate group) + // type:oid of the abstract role if approverRef is an abstract role (in that case, it is used as a candidate group) + // syntax was changed in midPoint 3.6 (e.g. from role:oid to RoleType:oid) public static final String CANDIDATE_GROUPS = "candidateGroups"; // Whether we have to stop evaluating current level (e.g. because strategy was 'firstDecides' and the first person decided (approved or rejected). diff --git a/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/TaskCreateListener.java b/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/TaskCreateListener.java index 0b547ff9d40..43551ab9a89 100644 --- a/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/TaskCreateListener.java +++ b/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/processes/itemApproval/TaskCreateListener.java @@ -37,6 +37,7 @@ public class TaskCreateListener implements TaskListener { public void notify(DelegateTask delegateTask) { OperationResult result = new OperationResult(TaskCreateListener.class.getName() + ".notify"); Task wfTask = ActivitiUtil.getTask(delegateTask.getExecution(), result); + String taskId = delegateTask.getId(); // duration/deadline ApprovalLevelType level = WfContextUtil.getCurrentApprovalLevel(wfTask.getWorkflowContext()); @@ -49,14 +50,15 @@ public void notify(DelegateTask delegateTask) { // triggers int escalationLevel = ActivitiUtil.getEscalationLevelNumber(delegateTask.getVariables()); - MidpointUtil.createTriggersForTimedActions(delegateTask.getId(), escalationLevel, delegateTask.getCreateTime(), + MidpointUtil.createTriggersForTimedActions(taskId, escalationLevel, delegateTask.getCreateTime(), delegateTask.getDueDate(), wfTask, level.getTimedActions(), result); // originalAssignee String assignee = delegateTask.getAssignee(); if (assignee != null) { TaskService taskService = delegateTask.getExecution().getEngineServices().getTaskService(); - taskService.setVariableLocal(delegateTask.getId(), CommonProcessVariableNames.VARIABLE_ORIGINAL_ASSIGNEE, assignee); + taskService.setVariableLocal(taskId, CommonProcessVariableNames.VARIABLE_ORIGINAL_ASSIGNEE, assignee); + taskService.addUserIdentityLink(taskId, assignee, CommonProcessVariableNames.MIDPOINT_ASSIGNEE); } getActivitiInterface().notifyMidpointAboutTaskEvent(delegateTask); diff --git a/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java b/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java index 879c6881f8b..8efc2214a45 100644 --- a/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java +++ b/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/util/MiscDataUtil.java @@ -67,9 +67,11 @@ import javax.xml.bind.JAXBException; import javax.xml.namespace.QName; import java.util.*; +import java.util.stream.Collectors; import static com.evolveum.midpoint.prism.delta.ChangeType.ADD; import static com.evolveum.midpoint.schema.ObjectTreeDeltas.fromObjectTreeDeltasType; +import static org.apache.commons.collections.CollectionUtils.addIgnoreNull; /** * @author mederly @@ -80,9 +82,6 @@ public class MiscDataUtil { private static final transient Trace LOGGER = TraceManager.getTrace(MiscDataUtil.class); - public static final String ROLE_PREFIX = "role"; - public static final String ORG_PREFIX = "org"; - @Autowired @Qualifier("cacheRepositoryService") private RepositoryService repositoryService; @@ -113,7 +112,7 @@ public static ObjectReferenceType toObjectReferenceType(LightweightObjectRef ref } } - //region ========================================================================== Miscellaneous + //region ========================================================================== Miscellaneous public PrismObject getUserByOid(String oid, OperationResult result) { if (oid == null) { return null; @@ -264,27 +263,36 @@ public Task getShadowTask(Map variables, OperationResult result) @NotNull public static String refToString(@NotNull ObjectReferenceType ref) { return - (ref.getType() != null ? ref.getType().getLocalPart() : "") + (ref.getType() != null ? ref.getType().getLocalPart() : UserType.COMPLEX_TYPE.getLocalPart()) + CommonProcessVariableNames.TYPE_NAME_SEPARATOR + ref.getOid(); } + public static List refsToStrings(@NotNull Collection refs) { + return refs.stream().map(r -> refToString(r)).collect(Collectors.toList()); + } + + @NotNull + public static List prismRefsToStrings(Collection refs) { + List rv = new ArrayList<>(); + for (PrismReferenceValue ref : refs) { + addIgnoreNull(rv, refToString(ObjectTypeUtil.createObjectRef(ref))); + } + return rv; + } + @NotNull public static ObjectReferenceType stringToRef(@NotNull String s) { String[] parts = s.split(CommonProcessVariableNames.TYPE_NAME_SEPARATOR); - ObjectReferenceType ref = new ObjectReferenceType(); if (parts.length == 0 || parts.length > 2) { throw new IllegalArgumentException("Incorrect reference string representation: " + s); } else if (parts.length == 1) { - ref.setOid(parts[0]); - ref.setType(UserType.COMPLEX_TYPE); + return new ObjectReferenceType().oid(parts[0]).type(UserType.COMPLEX_TYPE); } else { - ref.setOid(parts[1]); // TODO support namespaces other than c: QName type = StringUtils.isEmpty(parts[0]) ? UserType.COMPLEX_TYPE : new QName(SchemaConstants.NS_C, parts[0]); - ref.setType(type); + return new ObjectReferenceType().oid(parts[1]).type(type); } - return ref; } public enum RequestedOperation { @@ -392,7 +400,7 @@ public static Map formPropertiesAsMap(List pr } public boolean isMemberOfActivitiGroup(UserType userType, String activitiGroupId) { - ObjectReferenceType groupRef = groupIdToObjectReference(activitiGroupId); + ObjectReferenceType groupRef = stringToRef(activitiGroupId); return userType.getRoleMembershipRef().stream().anyMatch(ref -> matches(groupRef, ref)) || userType.getDelegatedRef().stream().anyMatch(ref -> matches(groupRef, ref)); } @@ -456,30 +464,6 @@ public ObjectReferenceType resolveObjectReferenceName(ObjectReferenceType ref, O return ref; } - public ObjectReferenceType groupIdToObjectReference(String groupId) { - String parts[] = groupId.split(":"); - if (parts.length != 2) { - throw new IllegalStateException("Invalid format of group id: " + groupId); - } - if (ROLE_PREFIX.equals(parts[0])) { - return MiscSchemaUtil.createObjectReference(parts[1], RoleType.COMPLEX_TYPE); - } else if (ORG_PREFIX.equals(parts[0])) { - return MiscSchemaUtil.createObjectReference(parts[1], OrgType.COMPLEX_TYPE); - } else { - throw new IllegalStateException("Unknown kind of group id: " + parts[0] + " in: " + groupId); - } - } - - private String objectReferenceToGroupName(ObjectReferenceType ref) { - if (RoleType.COMPLEX_TYPE.equals(ref.getType())) { - return ROLE_PREFIX + ":" + ref.getOid(); - } else if (OrgType.COMPLEX_TYPE.equals(ref.getType())) { - return ORG_PREFIX + ":" + ref.getOid(); - } else { - return null; - } - } - public void generateFocusOidIfNeeded(ModelContext modelContext, ObjectDelta change) { if (modelContext.getFocusContext().getOid() != null) { return; diff --git a/model/workflow-impl/src/main/resources/mybatis/Task.xml b/model/workflow-impl/src/main/resources/mybatis/Task.xml index 6c8a80a0f7e..5d4583c5620 100644 --- a/model/workflow-impl/src/main/resources/mybatis/Task.xml +++ b/model/workflow-impl/src/main/resources/mybatis/Task.xml @@ -597,13 +597,16 @@ ) - + and ( exists(select LINK.USER_ID_ from ${prefix}ACT_RU_IDENTITYLINK LINK where USER_ID_ = #{involvedUser} and LINK.TASK_ID_ = RES.ID_) or RES.ASSIGNEE_ = #{involvedUser} or RES.OWNER_ = #{involvedUser} ) + + and exists(select LINK.USER_ID_ from ${prefix}ACT_RU_IDENTITYLINK LINK where USER_ID_ in #{item} and LINK.TASK_ID_ = RES.ID_) + @@ -918,14 +921,18 @@ )) - + or ( exists(select LINK.USER_ID_ from ${prefix}ACT_RU_IDENTITYLINK LINK where USER_ID_ = #{orQueryObject.involvedUser} and LINK.TASK_ID_ = RES.ID_) or RES.ASSIGNEE_ = #{orQueryObject.involvedUser} or RES.OWNER_ = #{orQueryObject.involvedUser} ) - + + or exists(select LINK.USER_ID_ from ${prefix}ACT_RU_IDENTITYLINK LINK where USER_ID_ in #{item} and LINK.TASK_ID_ = RES.ID_) + + + or diff --git a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestActivitiQuery.java b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestActivitiQuery.java index c7b26f6bd70..5bdb9286a13 100644 --- a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestActivitiQuery.java +++ b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestActivitiQuery.java @@ -21,17 +21,18 @@ import com.evolveum.midpoint.prism.query.ObjectQuery; import com.evolveum.midpoint.prism.query.builder.QueryBuilder; import com.evolveum.midpoint.schema.SearchResultList; -import com.evolveum.midpoint.schema.constants.ObjectTypes; import com.evolveum.midpoint.schema.result.OperationResult; -import com.evolveum.midpoint.schema.util.ObjectTypeUtil; import com.evolveum.midpoint.task.api.Task; import com.evolveum.midpoint.test.util.TestUtil; +import com.evolveum.midpoint.util.logging.Trace; +import com.evolveum.midpoint.util.logging.TraceManager; import com.evolveum.midpoint.wf.impl.activiti.ActivitiEngine; import com.evolveum.midpoint.wf.impl.policy.AbstractWfTestPolicy; import com.evolveum.midpoint.wf.impl.processes.common.CommonProcessVariableNames; import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType; import com.evolveum.midpoint.xml.ns._public.common.common_3.WorkItemType; import org.activiti.engine.TaskService; +import org.activiti.engine.task.IdentityLink; import org.activiti.engine.task.TaskQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.annotation.DirtiesContext; @@ -41,9 +42,7 @@ import java.util.ArrayList; import java.util.List; -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.assertNotNull; -import static org.testng.AssertJUnit.assertNull; +import static org.testng.AssertJUnit.*; /** * @author mederly @@ -52,6 +51,8 @@ @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) public class TestActivitiQuery extends AbstractWfTestPolicy { + protected static final Trace LOGGER = TraceManager.getTrace(TestActivitiQuery.class); + @Override protected PrismObject getDefaultActor() { return userAdministrator; @@ -99,6 +100,10 @@ public void test100SearchByMoreAssignees() throws Exception { } } + /** + * Actually, this mechanism is not used anymore. We use identity links to store information about assignees. + * But keeping this test - just in case something like that would be needed later. + */ @Test public void test200TestQueryByTaskVariable() throws Exception { final String TEST_NAME = "test200TestQueryByTaskVariable"; @@ -112,14 +117,12 @@ public void test200TestQueryByTaskVariable() throws Exception { assertNotNull("No task", task); final String TASK_NAME = "Approve assigning Role1a to jack"; - final String VAR = CommonProcessVariableNames.VARIABLE_ADDITIONAL_ASSIGNEES; + final String VAR = "someVariable"; taskService.setVariableLocal(task.getId(), VAR, "[:abc];[:def];[UserType:"+userLead1Oid+"]"); TaskQuery tq1 = taskService.createTaskQuery().includeTaskLocalVariables() .taskVariableValueLike(VAR, "%:def]%") .taskName(TASK_NAME); - org.activiti.engine.task.Task task1 = tq1.singleResult(); - System.out.println("Task1 = " + task1); - assertNotNull("No task1", task1); + assertFound(tq1, "#1"); TaskQuery tq2 = taskService.createTaskQuery().includeTaskLocalVariables().taskVariableValueLike(VAR, "%:xyz]%"); org.activiti.engine.task.Task task2 = tq2.singleResult(); @@ -175,16 +178,109 @@ public void test200TestQueryByTaskVariable() throws Exception { .or() .taskVariableValueLike(VAR, "%:xxx]%") .taskVariableValueLike(VAR, "%:yyy]%") - .taskAssignee("xxx;" + userLead1Oid) + .taskAssignee("xxx;UserType:" + userLead1Oid) .endOr(); org.activiti.engine.task.Task task7 = tq7.singleResult(); System.out.println("Task7 = " + task7); assertNotNull("No task7", task7); + } + + @Test + public void test210TestQueryByIdentityLink() throws Exception { + final String TEST_NAME = "test210TestQueryByIdentityLink"; + TestUtil.displayTestTile(this, TEST_NAME); + login(userAdministrator); + + TaskService taskService = activitiEngine.getTaskService(); + TaskQuery tq = taskService.createTaskQuery(); + org.activiti.engine.task.Task task = tq.singleResult(); + System.out.println("Task = " + task); + assertNotNull("No task", task); + + final String TASK_NAME = "Approve assigning Role1a to jack"; + List linksBefore = taskService.getIdentityLinksForTask(task.getId()); + System.out.println("Identity links (before)" + linksBefore); + taskService.addUserIdentityLink(task.getId(), "123", CommonProcessVariableNames.MIDPOINT_ASSIGNEE); + taskService.addUserIdentityLink(task.getId(), "456", CommonProcessVariableNames.MIDPOINT_ASSIGNEE); + List linksAfter = taskService.getIdentityLinksForTask(task.getId()); + System.out.println("Identity links (after)" + linksAfter); + + TaskQuery tq1 = taskService.createTaskQuery() + .taskInvolvedUser("UserType:"+userLead1Oid) + .taskName(TASK_NAME); + assertFound(tq1, "involved user (assignee)"); + assertFound(taskService.createTaskQuery() + .taskInvolvedUser("123") + .taskName(TASK_NAME), + "involved user (midpoint-assignee 123)"); + + assertFound(taskService.createTaskQuery() + .taskInvolvedUser("456") + .taskName(TASK_NAME), + "involved user (midpoint-assignee 456)"); + + assertNotFound(taskService.createTaskQuery() + .taskInvolvedUser("123xxx") + .taskName(TASK_NAME), + "involved user (wrong user)"); + + assertFound(taskService.createTaskQuery() + .taskInvolvedUser("123;124") + .taskName(TASK_NAME), + "involved user (123 or 124)"); + + assertFound(taskService.createTaskQuery() + .taskInvolvedUser("124;123") + .taskName(TASK_NAME), + "involved user (124 or 123)"); + + assertNotFound(taskService.createTaskQuery() + .taskInvolvedUser("124x;123x") + .taskName(TASK_NAME), + "involved user (124x or 123x)"); + + assertFound(taskService.createTaskQuery() + .or() + .taskInvolvedUser("123") + .taskCandidateGroup("xxxxxxx") + .endOr() + .taskName(TASK_NAME), + "involved user (123 or candidate group xxxxxxx)"); + + assertFound(taskService.createTaskQuery() + .or() + .taskInvolvedUser("123;124") + .taskCandidateGroup("xxxxxxx") + .endOr() + .taskName(TASK_NAME), + "involved user (123 or 124 or candidate group xxxxxxx)"); + + assertNotFound(taskService.createTaskQuery() + .or() + .taskInvolvedUser("123x;124x") + .taskCandidateGroup("xxxxxxx") + .endOr() + .taskName(TASK_NAME), + "involved user (123x or 124x or candidate group xxxxxxx)"); + } + + private void assertFound(TaskQuery tq1, String desc) { + LOGGER.trace("Executing query {}", desc); + org.activiti.engine.task.Task task1 = tq1.singleResult(); + System.out.println("Task for " + desc + ": " + task1); + assertNotNull("No task for " + desc, task1); + } + + private void assertNotFound(TaskQuery tq1, String desc) { + LOGGER.trace("Executing query {}", desc); + org.activiti.engine.task.Task task1 = tq1.singleResult(); + System.out.println("Task for " + desc + ": " + task1); + assertNull("Found task for " + desc + " even if there shouldn't be one", task1); } @Test - public void test210SearchByAssignee() throws Exception { + public void test300SearchByAssignee() throws Exception { final String TEST_NAME = "test210SearchByAssignee"; TestUtil.displayTestTile(this, TEST_NAME); login(userAdministrator); diff --git a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestDelegation.java b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestDelegation.java index af157a8b7dd..cc10caffc1d 100644 --- a/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestDelegation.java +++ b/model/workflow-impl/src/test/java/com/evolveum/midpoint/wf/impl/policy/other/TestDelegation.java @@ -38,8 +38,11 @@ import org.springframework.test.context.ContextConfiguration; import org.testng.annotations.Test; +import java.util.Arrays; import java.util.Collections; +import java.util.HashSet; import java.util.List; +import java.util.stream.Collectors; import static com.evolveum.midpoint.test.IntegrationTestTools.display; import static com.evolveum.midpoint.test.util.TestUtil.assertSuccess; @@ -148,16 +151,22 @@ public void test120DelegateToUser2() throws Exception { .taskId(workItem.getWorkItemId()) .singleResult(); System.out.println("Activiti task: " + activitiTask); - assertEquals("Wrong activiti assignee", userLead1Oid, activitiTask.getAssignee()); - String additionalAssignees = (String) activitiEngine.getTaskService() - .getVariables(activitiTask.getId()).get(CommonProcessVariableNames.VARIABLE_ADDITIONAL_ASSIGNEES); - assertEquals("Wrong additional assignees", "[UserType:" + userLead2Oid + "]", additionalAssignees); + assertEquals("Wrong activiti assignee", "UserType:"+userLead1Oid, activitiTask.getAssignee()); + List assignees = getAssignees(activitiTask); + assertEquals("Wrong midpoint-assignee values", new HashSet<>(Arrays.asList("UserType:" + userLead1Oid, "UserType:" + userLead2Oid)), + new HashSet<>(assignees)); List events = WfContextUtil.getWorkItemEvents(wfTask.asObjectable().getWorkflowContext(), workItemId, WorkItemDelegationEventType.class); assertEquals("Wrong # of delegation events", 1, events.size()); // TODO check content } + private List getAssignees(org.activiti.engine.task.Task activitiTask) { + return activitiEngine.getTaskService().getIdentityLinksForTask(activitiTask.getId()).stream() + .filter(i -> CommonProcessVariableNames.MIDPOINT_ASSIGNEE.equals(i.getType())) + .map(i -> i.getUserId()).collect(Collectors.toList()); + } + @Test public void test130DelegateToUser3ByReplace() throws Exception { final String TEST_NAME = "test130DelegateToUser3ByReplace"; @@ -185,10 +194,10 @@ public void test130DelegateToUser3ByReplace() throws Exception { .taskId(workItem.getWorkItemId()) .singleResult(); System.out.println("Activiti task: " + activitiTask); - assertEquals("Wrong activiti assignee", userLead3Oid, activitiTask.getAssignee()); - String additionalAssignees = (String) activitiEngine.getTaskService() - .getVariables(activitiTask.getId()).get(CommonProcessVariableNames.VARIABLE_ADDITIONAL_ASSIGNEES); - assertNull("additionalAssignees present but it shouldn't be", additionalAssignees); + assertEquals("Wrong activiti assignee", "UserType:"+userLead3Oid, activitiTask.getAssignee()); + List assignees = getAssignees(activitiTask); + assertEquals("Wrong midpoint-assignee values", Collections.singleton("UserType:" + userLead3Oid), + new HashSet<>(assignees)); List events = WfContextUtil.getWorkItemEvents(wfTask.asObjectable().getWorkflowContext(), workItemId, WorkItemDelegationEventType.class); assertEquals("Wrong # of delegation events", 2, events.size()); @@ -223,9 +232,7 @@ public void test140DelegateToNoneByReplace() throws Exception { .singleResult(); System.out.println("Activiti task: " + activitiTask); assertEquals("Wrong activiti assignee", null, activitiTask.getAssignee()); - String additionalAssignees = (String) activitiEngine.getTaskService() - .getVariables(activitiTask.getId()).get(CommonProcessVariableNames.VARIABLE_ADDITIONAL_ASSIGNEES); - assertNull("additionalAssignees present but it shouldn't be", additionalAssignees); + assertEquals("Wrong # of assignees", 0, getAssignees(activitiTask).size()); List events = WfContextUtil.getWorkItemEvents(wfTask.asObjectable().getWorkflowContext(), workItemId, WorkItemDelegationEventType.class); assertEquals("Wrong # of delegation events", 3, events.size()); From 89648de5a6b5eb28e2f6f85effea0ca247491c42 Mon Sep 17 00:00:00 2001 From: Pavol Mederly Date: Sat, 25 Mar 2017 00:22:23 +0100 Subject: [PATCH 5/7] (Approximate) fix for MID-3815: Indirect relation=manager assignment of Authorization (MP only) role --- .../model/impl/lens/AssignmentEvaluator.java | 11 +- .../impl/lens/AssignmentPathSegmentImpl.java | 38 ++++- .../impl/lens/TestAssignmentProcessor2.java | 144 +++++++++++++++++- 3 files changed, 184 insertions(+), 9 deletions(-) diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java index 64c0a471c96..c490d38a958 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java @@ -639,8 +639,8 @@ private void evaluateSegmentTarget(AssignmentPathSegmentImpl segment, PlusMinusZ evaluateAssignment(segment, mode, isValid, ctx, targetType, relation, roleAssignment); } - boolean matchesOrder = AssignmentPathSegmentImpl.computeMatchingOrder(segment.getEvaluationOrder(), 1, Collections.emptyList()); - if (matchesOrder && targetType instanceof AbstractRoleType && isNonNegative(mode)) { + //boolean matchesOrder = AssignmentPathSegmentImpl.computeMatchingOrder(segment.getEvaluationOrder(), 1, Collections.emptyList()); + if (segment.isMatchingOrder() && targetType instanceof AbstractRoleType && isNonNegative(mode)) { for (AuthorizationType authorizationType: ((AbstractRoleType)targetType).getAuthorization()) { Authorization authorization = createAuthorization(authorizationType, targetType.toString()); if (!ctx.evalAssignment.getAuthorizations().contains(authorization)) { @@ -755,11 +755,14 @@ private void evaluateInducement(AssignmentPathSegmentImpl segment, PlusMinusZero nextEvaluationOrder = EvaluationOrderImpl.UNDEFINED; nextEvaluationOrderForTarget = EvaluationOrderImpl.UNDEFINED; } - } else { + } else if (inducement.getOrderConstraint().isEmpty()) { + // i.e. order is null or 1 nextEvaluationOrder = segment.getEvaluationOrder(); nextEvaluationOrderForTarget = segment.getEvaluationOrderForTarget(); + } else { + nextEvaluationOrder = EvaluationOrderImpl.UNDEFINED; + nextEvaluationOrderForTarget = EvaluationOrderImpl.UNDEFINED; } - // TODO undefined if intervals nextSegment.setEvaluationOrder(nextEvaluationOrder, nextIsMatchingOrder); nextSegment.setEvaluationOrderForTarget(nextEvaluationOrderForTarget, nextIsMatchingOrderForTarget); diff --git a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java index e4d65ddae80..3de0da8c37d 100644 --- a/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java +++ b/model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegmentImpl.java @@ -94,7 +94,7 @@ public class AssignmentPathSegmentImpl implements AssignmentPathSegment { * it with the order (or, more generally, order constraints) of the inducement. If they match, we say that inducement * has matching order. * - * As for #2: It is not usual that inducements have targets with another assignments, i.e. that evaluation continues + * As for #2: It is not usual that inducements have targets (roles) with another assignments, i.e. that evaluation continues * after inducement segments. But it definitely could happen. We can look at it this way: inducement is something like * a "shortcut" that creates an assignment where no assignment was before. E.g. if we have R1 -A-> MR1 -I-> MR2, * the "newly created" assignment is R1 -A-> MR2. I.e. as if the " -A-> MR1 -I-> " part was just replaced by " -A-> ". @@ -106,12 +106,42 @@ public class AssignmentPathSegmentImpl implements AssignmentPathSegment { * TODO think this through, perhaps based on concrete examples * * It is almost certain that for some inducements we would not be able to determine the resulting order. - * Such problematic inducements are those that do not have strict order, but an interval of orders instead. + * Such problematic inducements are those that do not have strict (scalar) order constraint, but something + * more complex, e.g. interval of orders. * * Until no better algorithm is devised, we will do an approximation: when "traditional" inducement order is given, * the we will compute the resulting order as "previous - (N-1)", where N is the order of the inducement - * (unspecified means 1). But beware, we will not manipulate evaluation order parts that are specific to relations. - * So, it is not safe to combine "higher-order inducements with targets" with non-scalar order constraints. + * (unspecified means 1). But beware, we will not decrease evaluation order for non-default relations! + * Also, if the traditional inducement order is not given, but orderConstraints are present instead, we will + * simply stop evaluation of further path segments altogether. + * + * So, it is not supported to combine inducements with complex (non-scalar) order constraints with further + * targets (assignments/inducements). Only membership, authorizations and GUI config from such inducement targets + * will be collected. See test500/test510 in TestAssignmentProcessor2. + * + * Unfortunately, this is by no means a rare case. It can easily occur when org structures are used. + * As depicted in that test, imagine this: + * + * Org1 -----I----+ Org2 -----I----+ + * ^ | (orderConstraints 1..N) ^ | (orderConstraints: manager: 1) + * | | | | + * | V | V + * Org11 Admin Org21 Admin + * ^ ^ + * | (manager) + * | | + * jack jack + * + * So, we are in trouble when we try to attach an inducement to a organization hierarchy top; to be applied to + * users that are part of the organizational structure (at any level). The reason is that the inducement has + * to have non-scalar constraint. + * + * TODO think this through. + * + * Maybe something like "continue with specified evaluation order" could be provided in OrgX->Admin inducement. + * But this would be quite complicated. + * + * ---- * * Because evaluation order can "increase" and "decrease", it is possible that it goes to zero or below, and then * increase back to positive numbers. Is that OK? Imagine this: diff --git a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor2.java b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor2.java index 372a82b3e1f..48257b99b3e 100644 --- a/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor2.java +++ b/model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/lens/TestAssignmentProcessor2.java @@ -99,6 +99,7 @@ public class TestAssignmentProcessor2 extends AbstractLensTest { private static final boolean FIRST_PART = true; private static final boolean SECOND_PART = true; private static final boolean THIRD_PART = true; + private static final boolean FOURTH_PART = true; private static final File RESOURCE_DUMMY_EMPTY_FILE = new File(TEST_DIR, "resource-dummy-empty.xml"); private static final String RESOURCE_DUMMY_EMPTY_OID = "10000000-0000-0000-0000-00000000EEE4"; @@ -122,6 +123,10 @@ public class TestAssignmentProcessor2 extends AbstractLensTest { private RoleType rolePirate, roleSailor, roleMan, roleWoman, roleHuman; private RoleType metaroleCrewMember, metarolePerson; + // fourth part + private OrgType org1, org11, org2, org21; + private RoleType roleAdmin; + private List objects; private static final String ROLE_R1_OID = getRoleOid("R1"); @@ -129,6 +134,8 @@ public class TestAssignmentProcessor2 extends AbstractLensTest { private static final String ROLE_MR1_OID = getRoleOid("MR1"); private static final String ROLE_PIRATE_OID = getRoleOid("Pirate"); private static final String ROLE_MAN_OID = getRoleOid("Man"); + private static final String ORG11_OID = getRoleOid("org11"); + private static final String ORG21_OID = getRoleOid("org21"); @Override public void initSystem(Task initTask, OperationResult initResult) throws Exception { @@ -1399,6 +1406,111 @@ public static void finishCallback(String desc) { } } + /** + * Testing non-scalar constraints (MID-3815) + * + * Org1 -----I----+ Org2 -----I----+ + * ^ | (orderConstraints 1..N) ^ | (orderConstraints: manager: 1) + * | | | | + * | V | V + * Org11 Admin Org21 Admin + * ^ ^ + * | (manager) + * | | + * jack jack + * + * Authorizations and GUI configuration from role Admin should be given to jack. + */ + + @Test(enabled = FOURTH_PART) + public void test500AssignJackOrg11() throws Exception { + final String TEST_NAME = "test500AssignJackOrg11"; + TestUtil.displayTestTile(this, TEST_NAME); + + // GIVEN + Task task = taskManager.createTaskInstance(TestAssignmentProcessor.class.getName() + "." + TEST_NAME); + OperationResult result = task.getResult(); + + createObjectsInFourthPart(false, task, result, null); + + LensContext context = createContextForAssignment(UserType.class, USER_JACK_OID, OrgType.class, ORG11_OID, null, null, result); + + // WHEN + assignmentProcessor.processAssignmentsProjections(context, clock.currentTimeXMLGregorianCalendar(), task, result); + + // THEN + display("Output context", context); + display("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); + + result.computeStatus(); + assertSuccess("Assignment processor failed (result)", result); + + Collection> evaluatedAssignments = assertAssignmentTripleSetSize(context, 0, 1, 0); + EvaluatedAssignmentImpl evaluatedAssignment = evaluatedAssignments.iterator().next(); + assertEquals("Wrong evaluatedAssignment.isValid", true, evaluatedAssignment.isValid()); + + assertTargets(evaluatedAssignment, true, "org11 Admin", null, null, null, null, null); + assertTargets(evaluatedAssignment, false, "org1", null, null, null, null, null); + assertMembershipRef(evaluatedAssignment, "org11 Admin"); + assertOrgRef(evaluatedAssignment, "org11"); + assertDelegation(evaluatedAssignment, ""); + + String expectedItems = "org11-1 org1-2"; + assertConstructions(evaluatedAssignment, expectedItems, null, null, null, null, null); + assertFocusMappings(evaluatedAssignment, expectedItems); + assertFocusPolicyRules(evaluatedAssignment, expectedItems); + + assertTargetPolicyRules(evaluatedAssignment, + "org11-0 org1-1", + ""); + assertAuthorizations(evaluatedAssignment, "org11 Admin"); + assertGuiConfig(evaluatedAssignment, "org11 Admin"); + } + + @Test(enabled = FOURTH_PART) + public void test510AssignJackOrg21() throws Exception { + final String TEST_NAME = "test510AssignJackOrg21"; + TestUtil.displayTestTile(this, TEST_NAME); + + // GIVEN + Task task = taskManager.createTaskInstance(TestAssignmentProcessor.class.getName() + "." + TEST_NAME); + OperationResult result = task.getResult(); + + LensContext context = createContextForAssignment(UserType.class, USER_JACK_OID, OrgType.class, ORG21_OID, + new QName("manager"), null, result); // intentionally unqualified + + // WHEN + assignmentProcessor.processAssignmentsProjections(context, clock.currentTimeXMLGregorianCalendar(), task, result); + + // THEN + display("Output context", context); + display("Evaluated assignment triple", context.getEvaluatedAssignmentTriple()); + + result.computeStatus(); + assertSuccess("Assignment processor failed (result)", result); + + Collection> evaluatedAssignments = assertAssignmentTripleSetSize(context, 0, 1, 0); + EvaluatedAssignmentImpl evaluatedAssignment = evaluatedAssignments.iterator().next(); + assertEquals("Wrong evaluatedAssignment.isValid", true, evaluatedAssignment.isValid()); + + assertTargets(evaluatedAssignment, true, "org21 Admin", null, null, null, null, null); + assertTargets(evaluatedAssignment, false, "org2", null, null, null, null, null); + assertMembershipRef(evaluatedAssignment, "org21 Admin"); + assertOrgRef(evaluatedAssignment, "org21"); + assertDelegation(evaluatedAssignment, ""); + + String expectedItems = "org21-1 org2-2"; + assertConstructions(evaluatedAssignment, expectedItems, null, null, null, null, null); + assertFocusMappings(evaluatedAssignment, expectedItems); + assertFocusPolicyRules(evaluatedAssignment, expectedItems); + + assertTargetPolicyRules(evaluatedAssignment, + "org21-0 org2-1", + ""); + assertAuthorizations(evaluatedAssignment, "org21 Admin"); + assertGuiConfig(evaluatedAssignment, "org21 Admin"); + } + //region ============================================================= helper methods (preparing scenarios) private void createObjectsInFirstPart(boolean deleteFirst, Task task, OperationResult result, Runnable adjustment) throws Exception { @@ -1478,6 +1590,36 @@ private void createObjectsInThirdPart(boolean deleteFirst, Task task, OperationR createObjects(deleteFirst, task, result, adjustment); } + private void createObjectsInFourthPart(boolean deleteFirst, Task task, OperationResult result, Runnable adjustment) throws Exception { + org1 = createOrg("org1"); + org11 = createOrg("org11"); + org2 = createOrg("org2"); + org21 = createOrg("org21"); + roleAdmin = createRole("Admin"); + + assign(org11, org1); + assign(org21, org2); + // org1->roleAdmin + AssignmentType inducement = ObjectTypeUtil.createAssignmentTo(roleAdmin.asPrismObject()) + .beginOrderConstraint() + .orderMin("1") + .orderMax("unbounded") + .end(); + org1.getInducement().add(inducement); + + // org2->roleAdmin + AssignmentType inducement2 = ObjectTypeUtil.createAssignmentTo(roleAdmin.asPrismObject()) + .beginOrderConstraint() + .order(1) + .relation(SchemaConstants.ORG_MANAGER) + .end(); + org2.getInducement().add(inducement2); + + objects = new ArrayList<>(Arrays.asList(roleAdmin, org1, org11, org2, org21)); + + createObjects(deleteFirst, task, result, adjustment); + } + private void createCustomConstruction(RoleType role, String name, int order) { ConstructionType c = new ConstructionType(prismContext); c.setDescription(name); @@ -1597,7 +1739,7 @@ private void induce(AbstractRoleType source, AbstractRoleType target, int induce source.getInducement().add(inducement); } - private void assign(RoleType source, RoleType target) { + private void assign(AbstractRoleType source, AbstractRoleType target) { AssignmentType assignment = ObjectTypeUtil.createAssignmentTo(target.asPrismObject()); source.getAssignment().add(assignment); } From 46f62b0f84dacdc4043c7eb1bdecb103dc1210e4 Mon Sep 17 00:00:00 2001 From: Pavol Mederly Date: Sat, 25 Mar 2017 00:26:22 +0100 Subject: [PATCH 6/7] Claim/release will correctly set midpoint-approver identity links. --- .../wf/impl/activiti/dao/WorkItemManager.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java b/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java index f369729ed26..cf45fed658a 100644 --- a/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java +++ b/model/workflow-impl/src/main/java/com/evolveum/midpoint/wf/impl/activiti/dao/WorkItemManager.java @@ -21,6 +21,7 @@ import com.evolveum.midpoint.prism.util.CloneUtil; import com.evolveum.midpoint.prism.xml.XmlTypeConverter; import com.evolveum.midpoint.schema.DeltaConvertor; +import com.evolveum.midpoint.schema.constants.ObjectTypes; import com.evolveum.midpoint.schema.constants.SchemaConstants; import com.evolveum.midpoint.schema.result.OperationResult; import com.evolveum.midpoint.schema.util.ObjectTypeUtil; @@ -172,7 +173,11 @@ public void claimWorkItem(String workItemId, OperationResult parentResult) throw throw new SecurityViolationException("You are not authorized to claim the selected work item."); } taskService.claim(workItemId, principal.getOid()); - // TODO assignees in identity links! + task = taskService.createTaskQuery().taskId(workItemId).singleResult(); + if (task == null) { + throw new ObjectNotFoundException("The work item does not exist"); + } + setNewAssignees(task, Collections.singletonList(ObjectTypeUtil.createObjectRef(principal.getOid(), ObjectTypes.USER)), taskService); } catch (ObjectNotFoundException|SecurityViolationException|RuntimeException e) { result.recordFatalError("Couldn't claim the work item " + workItemId + ": " + e.getMessage(), e); throw e; @@ -214,6 +219,11 @@ public void releaseWorkItem(String workItemId, OperationResult parentResult) thr throw new SystemException("It has no candidates to be offered to"); } taskService.unclaim(workItemId); + task = taskService.createTaskQuery().taskId(workItemId).singleResult(); + if (task == null) { + throw new ObjectNotFoundException("The work item does not exist"); + } + setNewAssignees(task, Collections.emptyList(), taskService); } catch (ObjectNotFoundException|SecurityViolationException|RuntimeException e) { result.recordFatalError("Couldn't release work item " + workItemId + ": " + e.getMessage(), e); throw e; From 7cc875db595bba1f33bf496e3fbfde538dcf4443 Mon Sep 17 00:00:00 2001 From: honchar Date: Sat, 25 Mar 2017 04:14:59 +0100 Subject: [PATCH 7/7] added authorizations for assignment details panel fields --- .../assignment/AssignmentDetailsPanel.java | 9 +- .../assignment/AssignmentEditorPanel.html | 12 +- .../assignment/AssignmentEditorPanel.java | 235 ++++++++++++++++-- .../assignment/AssignmentTablePanel.java | 13 +- .../assignment/ShoppingCartEditorPanel.html | 14 +- .../assignment/ShoppingCartEditorPanel.java | 9 +- .../web/page/self/PageAssignmentDetails.java | 2 +- .../web/page/self/PageAssignmentsList.java | 2 +- 8 files changed, 252 insertions(+), 44 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDetailsPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDetailsPanel.java index 3e6960cc6e8..d8df13dca86 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDetailsPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentDetailsPanel.java @@ -1,6 +1,7 @@ package com.evolveum.midpoint.web.component.assignment; import com.evolveum.midpoint.gui.api.component.BasePanel; +import com.evolveum.midpoint.gui.api.page.PageBase; import org.apache.wicket.model.IModel; /** @@ -13,14 +14,14 @@ public AssignmentDetailsPanel(String id) { super(id); } - public AssignmentDetailsPanel(String id, IModel model) { + public AssignmentDetailsPanel(String id, IModel model, PageBase pageBase) { super(id, model); - initLayout(); + initLayout(pageBase); } - private void initLayout() { + private void initLayout(PageBase pageBase) { setOutputMarkupId(true); - ShoppingCartEditorPanel assignmentDetailsPanel = new ShoppingCartEditorPanel(ID_DETAILS_PANEL, getModel()); + ShoppingCartEditorPanel assignmentDetailsPanel = new ShoppingCartEditorPanel(ID_DETAILS_PANEL, getModel(), pageBase); assignmentDetailsPanel.setOutputMarkupId(true); add(assignmentDetailsPanel); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.html index 17edc9fd5d5..da30f431cd0 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.html @@ -43,13 +43,13 @@
-
+
-
+
@@ -80,7 +80,7 @@
-
+
@@ -127,7 +127,7 @@
-
+
@@ -141,7 +141,7 @@
-
+
@@ -157,7 +157,7 @@
-
+
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java index d3f908fe8cb..4d47accdf49 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java @@ -26,6 +26,7 @@ import com.evolveum.midpoint.gui.api.model.LoadableModel; import com.evolveum.midpoint.gui.api.page.PageBase; import com.evolveum.midpoint.gui.api.util.WebComponentUtil; +import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils; import com.evolveum.midpoint.model.api.ModelService; import com.evolveum.midpoint.prism.*; import com.evolveum.midpoint.prism.path.ItemPath; @@ -34,6 +35,7 @@ import com.evolveum.midpoint.schema.GetOperationOptions; import com.evolveum.midpoint.schema.SelectorOptions; import com.evolveum.midpoint.schema.result.OperationResult; +import com.evolveum.midpoint.security.api.ItemSecurityDecisions; import com.evolveum.midpoint.task.api.Task; import com.evolveum.midpoint.util.MiscUtil; import com.evolveum.midpoint.util.exception.CommunicationException; @@ -94,6 +96,7 @@ public class AssignmentEditorPanel extends BasePanel { private static final String OPERATION_LOAD_OBJECT = DOT_CLASS + "loadObject"; private static final String OPERATION_LOAD_RESOURCE = DOT_CLASS + "loadResource"; private static final String OPERATION_LOAD_ATTRIBUTES = DOT_CLASS + "loadAttributes"; + private static final String OPERATION_LOAD_TARGET_OBJECT = DOT_CLASS + "loadUser"; private static final String ID_HEADER_ROW = "headerRow"; private static final String ID_SELECTED = "selected"; @@ -107,6 +110,7 @@ public class AssignmentEditorPanel extends BasePanel { private static final String ID_DESCRIPTION = "description"; private static final String ID_RELATION_CONTAINER = "relationContainer"; private static final String ID_FOCUS_TYPE = "focusType"; + private static final String ID_FOCUS_TYPE_CONTAINER = "focusTypeContainer"; protected static final String ID_RELATION = "relation"; private static final String ID_RELATION_LABEL = "relationLabel"; private static final String ID_ADMINISTRATIVE_STATUS = "administrativeStatus"; @@ -127,12 +131,18 @@ public class AssignmentEditorPanel extends BasePanel { private static final String ID_BUTTON_SHOW_MORE = "errorLink"; private static final String ID_ERROR_ICON = "errorIcon"; private static final String ID_METADATA_CONTAINER = "metadataContainer"; + private static final String ID_PROPERTY_CONTAINER = "propertyContainer"; + private static final String ID_DESCRIPTION_CONTAINER = "descriptionContainer"; + private static final String ID_ADMIN_STATUS_CONTAINER = "administrativeStatusContainer"; + private static final String ID_VALID_FROM_CONTAINER = "validFromContainer"; + private static final String ID_VALID_TO_CONTAINER = "validToContainer"; private IModel> attributesModel; protected WebMarkupContainer headerRow; protected PageBase pageBase; protected List privilegesList; protected boolean delegatedToMe; + private LoadableModel decisionsModel; public AssignmentEditorPanel(String id, IModel model, boolean delegatedToMe, List privilegesList, @@ -142,11 +152,17 @@ public AssignmentEditorPanel(String id, IModel model, boole this.privilegesList = privilegesList; this.delegatedToMe = delegatedToMe; + initDecisionsModel(); initLayout(); } public AssignmentEditorPanel(String id, IModel model) { + this(id, model, null); + } + + public AssignmentEditorPanel(String id, IModel model, PageBase pageBase) { super(id, model); + this.pageBase = pageBase; attributesModel = new LoadableModel>(false) { @Override @@ -154,7 +170,7 @@ protected List load() { return loadAttributes(); } }; - + initDecisionsModel(); initLayout(); } @@ -389,10 +405,33 @@ public void setObject(Date object) { } protected void initBodyLayout(WebMarkupContainer body) { + WebMarkupContainer propertyContainer = new WebMarkupContainer(ID_PROPERTY_CONTAINER); + propertyContainer.setOutputMarkupId(true); + body.add(propertyContainer); + + WebMarkupContainer descriptionContainer = new WebMarkupContainer(ID_DESCRIPTION_CONTAINER); + descriptionContainer.setOutputMarkupId(true); + descriptionContainer.add(new VisibleEnableBehaviour(){ + private static final long serialVersionUID = 1L; + + @Override + public boolean isVisible(){ + return isItemAllowed(new ItemPath(FocusType.F_ASSIGNMENT, AssignmentType.F_DESCRIPTION)); + } + }); + body.add(descriptionContainer); + TextArea description = new TextArea<>(ID_DESCRIPTION, new PropertyModel(getModel(), AssignmentEditorDto.F_DESCRIPTION)); - description.setEnabled(getModel().getObject().isEditable()); - body.add(description); + description.add(new VisibleEnableBehaviour() { + private static final long serialVersionUID = 1L; + + @Override + public boolean isEnabled() { + return getModel().getObject().isEditable(); + } + }); + descriptionContainer.add(description); WebMarkupContainer relationContainer = new WebMarkupContainer(ID_RELATION_CONTAINER); relationContainer.setOutputMarkupId(true); @@ -401,6 +440,10 @@ protected void initBodyLayout(WebMarkupContainer body) { @Override public boolean isVisible() { + if (!isItemAllowed(new ItemPath(FocusType.F_ASSIGNMENT, AssignmentType.F_TARGET_REF, + ObjectReferenceType.F_RELATION))){ + return false; + } AssignmentEditorDto dto = getModel().getObject(); if (dto != null) { if (AssignmentEditorDtoType.ORG_UNIT.equals(dto.getType()) || @@ -414,10 +457,23 @@ public boolean isVisible() { } }); body.add(relationContainer); + addRelationDropDown(relationContainer); + + WebMarkupContainer focusTypeContainer = new WebMarkupContainer(ID_FOCUS_TYPE_CONTAINER); + focusTypeContainer.setOutputMarkupId(true); + focusTypeContainer.add(new VisibleEnableBehaviour(){ + private static final long serialVersionUID = 1L; + + @Override + public boolean isVisible(){ + return isItemAllowed(new ItemPath(FocusType.F_ASSIGNMENT, AssignmentType.F_FOCUS_TYPE)); + } + }); + body.add(focusTypeContainer); + ObjectTypeSelectPanel focusType = new ObjectTypeSelectPanel<>(ID_FOCUS_TYPE, new PropertyModel(getModel(), AssignmentEditorDto.F_FOCUS_TYPE), FocusType.class); - body.add(focusType); - addRelationDropDown(relationContainer); + focusTypeContainer.add(focusType); Label relationLabel = new Label(ID_RELATION_LABEL, new AbstractReadOnlyModel() { @@ -446,46 +502,143 @@ public boolean isVisible() { relationContainer.add(relationLabel); WebMarkupContainer tenantRefContainer = createTenantContainer(); + tenantRefContainer.add(new VisibleEnableBehaviour(){ + private static final long serialVersionUID = 1L; + + @Override + public boolean isVisible(){ + return isItemAllowed(new ItemPath(FocusType.F_ASSIGNMENT, AssignmentType.F_TENANT_REF)); + } + }); body.add(tenantRefContainer); WebMarkupContainer orgRefContainer = createOrgContainer(); + orgRefContainer.add(new VisibleEnableBehaviour(){ + private static final long serialVersionUID = 1L; + + @Override + public boolean isVisible(){ + return isItemAllowed(new ItemPath(FocusType.F_ASSIGNMENT, AssignmentType.F_ORG_REF)); + } + }); body.add(orgRefContainer); + propertyContainer.add(new VisibleEnableBehaviour(){ + private static final long serialVersionUID = 1L; + + @Override + public boolean isVisible(){ + return isItemAllowed(new ItemPath(FocusType.F_ASSIGNMENT, AssignmentType.F_DESCRIPTION)) + || isItemAllowed(new ItemPath(FocusType.F_ASSIGNMENT, AssignmentType.F_TARGET_REF, + ObjectReferenceType.F_RELATION)) + || isItemAllowed(new ItemPath(FocusType.F_ASSIGNMENT, AssignmentType.F_FOCUS_TYPE)) + || isItemAllowed(new ItemPath(FocusType.F_ASSIGNMENT, AssignmentType.F_TENANT_REF)) + || isItemAllowed(new ItemPath(FocusType.F_ASSIGNMENT, AssignmentType.F_ORG_REF)); + } + + }); WebMarkupContainer activationBlock = new WebMarkupContainer(ID_ACTIVATION_BLOCK); - activationBlock.add(new VisibleEnableBehaviour() { + body.add(activationBlock); + + WebMarkupContainer adminStatusContainer = new WebMarkupContainer(ID_ADMIN_STATUS_CONTAINER); + adminStatusContainer.setOutputMarkupId(true); + adminStatusContainer.add(new VisibleEnableBehaviour() { + private static final long serialVersionUID = 1L; @Override public boolean isVisible() { - // enabled activation in assignments for now. - return true; + return isItemAllowed(new ItemPath(FocusType.F_ASSIGNMENT, AssignmentType.F_ACTIVATION, + ActivationType.F_ADMINISTRATIVE_STATUS)); } }); - body.add(activationBlock); + activationBlock.add(adminStatusContainer); DropDownChoicePanel administrativeStatus = WebComponentUtil.createEnumPanel( ActivationStatusType.class, ID_ADMINISTRATIVE_STATUS, new PropertyModel(getModel(), AssignmentEditorDto.F_ACTIVATION + "." + ActivationType.F_ADMINISTRATIVE_STATUS.getLocalPart()), this); - administrativeStatus.setEnabled(getModel().getObject().isEditable()); - activationBlock.add(administrativeStatus); + administrativeStatus.add(new VisibleEnableBehaviour(){ + private static final long serialVersionUID = 1L; + + @Override + public boolean isEnabled(){ + return getModel().getObject().isEditable(); + } + }); + adminStatusContainer.add(administrativeStatus); + + WebMarkupContainer validFromContainer = new WebMarkupContainer(ID_VALID_FROM_CONTAINER); + validFromContainer.setOutputMarkupId(true); + validFromContainer.add(new VisibleEnableBehaviour() { + private static final long serialVersionUID = 1L; + + @Override + public boolean isVisible() { + return isItemAllowed(new ItemPath(FocusType.F_ASSIGNMENT, AssignmentType.F_ACTIVATION, + ActivationType.F_VALID_FROM)); + } + }); + activationBlock.add(validFromContainer); DateInput validFrom = new DateInput(ID_VALID_FROM, createDateModel(new PropertyModel(getModel(), AssignmentEditorDto.F_ACTIVATION + ".validFrom"))); - validFrom.setEnabled(getModel().getObject().isEditable()); - activationBlock.add(validFrom); + validFrom.add(new VisibleEnableBehaviour(){ + private static final long serialVersionUID = 1L; + + @Override + public boolean isEnabled(){ + return getModel().getObject().isEditable(); + } + }); + validFromContainer.add(validFrom); + + WebMarkupContainer validToContainer = new WebMarkupContainer(ID_VALID_TO_CONTAINER); + validToContainer.setOutputMarkupId(true); + validToContainer.add(new VisibleEnableBehaviour() { + private static final long serialVersionUID = 1L; + + @Override + public boolean isVisible() { + return isItemAllowed(new ItemPath(FocusType.F_ASSIGNMENT, AssignmentType.F_ACTIVATION, + ActivationType.F_VALID_TO)); + } + }); + activationBlock.add(validToContainer); DateInput validTo = new DateInput(ID_VALID_TO, createDateModel(new PropertyModel(getModel(), AssignmentEditorDto.F_ACTIVATION + ".validTo"))); - validTo.setEnabled(getModel().getObject().isEditable()); - activationBlock.add(validTo); + validTo.add(new VisibleEnableBehaviour(){ + private static final long serialVersionUID = 1L; + + @Override + public boolean isEnabled(){ + return getModel().getObject().isEditable(); + } + }); + validToContainer.add(validTo); + + activationBlock.add(new VisibleEnableBehaviour() { + + @Override + public boolean isVisible() { + // enabled activation in assignments for now. + return true; + } + }); + + + WebMarkupContainer targetContainer = new WebMarkupContainer(ID_TARGET_CONTAINER); targetContainer.add(new VisibleEnableBehaviour() { @Override public boolean isVisible() { + if (!isItemAllowed(new ItemPath(FocusType.F_ASSIGNMENT, AssignmentType.F_TARGET))){ + return false; + } AssignmentEditorDto dto = getModel().getObject(); return !AssignmentEditorDtoType.CONSTRUCTION.equals(dto.getType()); } @@ -1037,4 +1190,56 @@ protected boolean isCreatingNewAssignment() { protected boolean ignoreMandatoryAttributes(){ return false; } + + private void initDecisionsModel(){ + decisionsModel = new LoadableModel(false) { + @Override + protected ItemSecurityDecisions load() { + return loadSecurityDecisions(); + } + }; + + } + + private boolean isItemAllowed(ItemPath itemPath){ + ItemSecurityDecisions decisions = decisionsModel.getObject(); + if (decisions == null){ + decisions = loadSecurityDecisions(); + } + if (itemPath == null || decisions == null || decisions.getItemDecisionMap() == null + || decisions.getItemDecisionMap().size() == 0){ + return true; + } + Map decisionsMap = decisions.getItemDecisionMap(); + boolean isAllowed = false; + for (ItemPath path : decisionsMap.keySet()) { + if (path.equivalent(itemPath) + && AuthorizationDecisionType.ALLOW.value().equals(decisionsMap.get(path).value())) { + return true; + } + } + return isAllowed; + } + + private ItemSecurityDecisions loadSecurityDecisions(){ + if (pageBase == null || getModelObject().getTargetRef() == null){ + return null; + } + PrismObject currentUser = pageBase.loadUserSelf(pageBase); + String targetObjectOid = getModelObject().getTargetRef().getOid(); + + Task task = pageBase.createSimpleTask(OPERATION_LOAD_TARGET_OBJECT); + OperationResult result = new OperationResult(OPERATION_LOAD_TARGET_OBJECT); + PrismObject targetRefObject = WebModelServiceUtils.loadObject(AbstractRoleType.class, targetObjectOid, pageBase, + task, result); + ItemSecurityDecisions decisions = null; + try{ + decisions = + pageBase.getModelInteractionService().getAllowedRequestAssignmentItems(currentUser, targetRefObject); + + } catch (SchemaException|SecurityViolationException ex){ + LoggingUtils.logUnexpectedException(LOGGER, "Couldn't load security decisions for assignment items.", ex); + } + return decisions; + } } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java index 1abcc8bd934..06a45bc3e51 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java @@ -22,6 +22,7 @@ import javax.xml.namespace.QName; +import com.evolveum.midpoint.gui.api.page.PageBase; import com.evolveum.midpoint.schema.constants.SchemaConstants; import com.evolveum.midpoint.security.api.AuthorizationConstants; @@ -90,13 +91,17 @@ public class AssignmentTablePanel extends BasePanel label, IModel> assignmentModel) { - super(id, assignmentModel); + this(id, label, assignmentModel, null); + } + public AssignmentTablePanel(String id, IModel label, + IModel> assignmentModel, PageBase pageBase) { + super(id, assignmentModel); + this.pageBase = pageBase; initLayout(label); } @@ -169,7 +174,7 @@ public boolean isVisible(){ } protected void populateAssignmentDetailsPanel(ListItem item){ - AssignmentEditorPanel editor = new AssignmentEditorPanel(ID_ROW, item.getModel()){ + AssignmentEditorPanel editor = new AssignmentEditorPanel(ID_ROW, item.getModel(), pageBase){ @Override protected boolean ignoreMandatoryAttributes(){ return AssignmentTablePanel.this.ignoreMandatoryAttributes(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingCartEditorPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingCartEditorPanel.html index 265c397fb7c..26cdf9ff9d2 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingCartEditorPanel.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingCartEditorPanel.html @@ -39,13 +39,13 @@
-
+
-
+
@@ -76,7 +76,7 @@
-
+
@@ -123,7 +123,7 @@
-
+
@@ -137,7 +137,7 @@
-
+
@@ -153,7 +153,7 @@
-
+
@@ -222,7 +222,7 @@
- +
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingCartEditorPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingCartEditorPanel.java index cb57a877ec2..a4924a1312b 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingCartEditorPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/ShoppingCartEditorPanel.java @@ -16,10 +16,7 @@ package com.evolveum.midpoint.web.component.assignment; -import com.evolveum.midpoint.gui.api.util.WebComponentUtil; -import com.evolveum.midpoint.web.component.input.DropDownChoicePanel; -import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour; -import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectReferenceType; +import com.evolveum.midpoint.gui.api.page.PageBase; import org.apache.wicket.AttributeModifier; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; @@ -46,8 +43,8 @@ public class ShoppingCartEditorPanel extends AssignmentEditorPanel { protected static final String ICON_BOX_CSS_CLASS = "info-box-icon"; - public ShoppingCartEditorPanel(String id, IModel model) { - super(id, model); + public ShoppingCartEditorPanel(String id, IModel model, PageBase pageBase) { + super(id, model, pageBase); } @Override diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentDetails.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentDetails.java index 6b774388cb4..acdbde2c2df 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentDetails.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentDetails.java @@ -47,7 +47,7 @@ public void initLayout(final IModel assignmentModel) { mainForm.setOutputMarkupId(true); add(mainForm); - AssignmentDetailsPanel detailsPanel = new AssignmentDetailsPanel(ID_DETAILS_PANEL, assignmentModel); + AssignmentDetailsPanel detailsPanel = new AssignmentDetailsPanel(ID_DETAILS_PANEL, assignmentModel, PageAssignmentDetails.this); detailsPanel.setOutputMarkupId(true); mainForm.add(detailsPanel); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java index de1f622f039..cc976a0cd7e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java @@ -89,7 +89,7 @@ public void initLayout() { add(mainForm); AssignmentTablePanel panel = new AssignmentTablePanel(ID_ASSIGNMENT_TABLE_PANEL, - createStringResource("FocusType.assignment"), assignmentsModel){ + createStringResource("FocusType.assignment"), assignmentsModel, PageAssignmentsList.this){ @Override protected List createAssignmentMenu() { List items = new ArrayList<>();