Merge branch 'master' of https://github.com/Evolveum/midpoint

gui/admin-gui/pom.xml

@@ -424,7 +424,6 @@
             <groupId>com.evolveum.midpoint.repo</groupId>
             <artifactId>repo-cache</artifactId>
             <version>3.9-SNAPSHOT</version>
-            <scope>runtime</scope>
             <exclusions>
                 <exclusion>
                     <artifactId>jaxb-impl</artifactId>
@@ -894,11 +893,6 @@
             <version>3.9-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.repo</groupId>
-            <artifactId>repo-cache</artifactId>
-            <version>3.9-SNAPSHOT</version>
-        </dependency>
     </dependencies>
 
     <profiles>

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/ChooseFocusTypeAndRelationDialogPanel.java

@@ -57,6 +57,7 @@ private void initLayout(){
 				"chooseFocusTypeAndRelationDialogPanel.tooltip.type", true, "col-md-4", "col-md-8", false);
 		type.getInput().add(new EmptyOnChangeAjaxFormUpdatingBehavior());
 	    type.setOutputMarkupId(true);
+	    type.add(new VisibleBehaviour(() -> isFocusTypeSelectorVisible()));
 	    add(type);
 
 	    	IModel<Map<String, String>> options = new Model(null);
@@ -117,6 +118,10 @@ protected List<QName> getSupportedRelations() {
 		return WebComponentUtil.getAllRelations(getPageBase());
 	}
 
+	protected boolean isFocusTypeSelectorVisible() {
+		return true;
+	}
+
 	@Override
 	public int getWidth() {
 		return 400;

gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/AbstractRoleMemberPanel.java

@@ -316,13 +316,6 @@ public void onClick(AjaxRequestTarget target) {
                 }
 
 				@Override
-				public IModel<String> getConfirmationMessageModel() {
-					return getMemberTable().getSelectedObjectsCount() > 0 ?
-							createStringResource("abstractRoleMemberPanel.unassignSelectedMembersConfirmationLabel")
-							: null;
-				}
-
-                @Override
                 public String getButtonIconCssClass() {
                     return GuiStyleConstants.CLASS_UNASSIGN;
                 }
@@ -392,12 +385,6 @@ public void onClick(AjaxRequestTarget target) {
                     };
                 }
 
-				@Override
-				public IModel<String> getConfirmationMessageModel() {
-					return getMemberTable().getSelectedObjectsCount() > 0 ?
-							createStringResource("abstractRoleMemberPanel.deleteSelectedMembersConfirmationLabel")
-							: null;
-				}
             });
         }
         return menu;
@@ -416,68 +403,66 @@ protected <O extends ObjectType> void assignMembers(AjaxRequestTarget target, Li
 
 	private void unassignMembersPerformed(AjaxRequestTarget target) {
 		QueryScope scope = getQueryScope(false);
-		if (QueryScope.SELECTED.equals(scope)){
-			MemberOperationsHelper.unassignMembersPerformed(getPageBase(), getModelObject(), scope,
-					getActionQuery(scope, null), null, getSearchType().getTypeQName(), target);
-
-		} else {
-			ChooseFocusTypeAndRelationDialogPanel chooseTypePopupContent = new ChooseFocusTypeAndRelationDialogPanel(getPageBase().getMainPopupBodyId(),
-					createStringResource("abstractRoleMemberPanel.unassignAllMembersConfirmationLabel")) {
-				private static final long serialVersionUID = 1L;
-
-				@Override
-				protected List<QName> getSupportedObjectTypes() {
-					return AbstractRoleMemberPanel.this.getSupportedObjectTypes();
-				}
+
+		ChooseFocusTypeAndRelationDialogPanel chooseTypePopupContent = new ChooseFocusTypeAndRelationDialogPanel(getPageBase().getMainPopupBodyId(),
+				createStringResource("abstractRoleMemberPanel.unassignAllMembersConfirmationLabel")) {
+			private static final long serialVersionUID = 1L;
 
-				@Override
-				protected List<QName> getSupportedRelations() {
-					return AbstractRoleMemberPanel.this.getSupportedRelations();
-				}
+			@Override
+			protected List<QName> getSupportedObjectTypes() {
+				return AbstractRoleMemberPanel.this.getSupportedObjectTypes();
+			}
 
+			@Override
+			protected List<QName> getSupportedRelations() {
+				return AbstractRoleMemberPanel.this.getSupportedRelations();
+			}
+
+			@Override
+			protected boolean isFocusTypeSelectorVisible() {
+				return !QueryScope.SELECTED.equals(scope);
+			}
 
-				protected void okPerformed(QName type, Collection<QName> relations, AjaxRequestTarget target) {
-					unassignMembersPerformed(type, scope, relations, target);
 
-				}
+			protected void okPerformed(QName type, Collection<QName> relations, AjaxRequestTarget target) {
+				unassignMembersPerformed(type, scope, relations, target);
 
-				;
-			};
+			}
+		};
 
-			getPageBase().showMainPopup(chooseTypePopupContent, target);
-		}
+		getPageBase().showMainPopup(chooseTypePopupContent, target);
 	}
 
 	private void deleteMembersPerformed(AjaxRequestTarget target) {
 		QueryScope scope = getQueryScope(false);
-		if (QueryScope.SELECTED.equals(scope)){
-			MemberOperationsHelper.deleteMembersPerformed(getPageBase(), scope, getActionQuery(scope, null),
-					getSearchType().getTypeQName(), target);
-		} else {
-			ChooseFocusTypeAndRelationDialogPanel chooseTypePopupContent = new ChooseFocusTypeAndRelationDialogPanel(getPageBase().getMainPopupBodyId(),
+		ChooseFocusTypeAndRelationDialogPanel chooseTypePopupContent = new ChooseFocusTypeAndRelationDialogPanel(getPageBase().getMainPopupBodyId(),
 					createStringResource("abstractRoleMemberPanel.deleteAllMembersConfirmationLabel")) {
-				private static final long serialVersionUID = 1L;
+			private static final long serialVersionUID = 1L;
 
-				@Override
-				protected List<QName> getSupportedObjectTypes() {
-					return AbstractRoleMemberPanel.this.getSupportedObjectTypes();
-				}
+			@Override
+			protected List<QName> getSupportedObjectTypes() {
+				return AbstractRoleMemberPanel.this.getSupportedObjectTypes();
+			}
 
-				@Override
-				protected List<QName> getSupportedRelations() {
-					return AbstractRoleMemberPanel.this.getSupportedRelations();
-				}
+			@Override
+			protected List<QName> getSupportedRelations() {
+				return AbstractRoleMemberPanel.this.getSupportedRelations();
+			}
 
-				protected void okPerformed(QName type, Collection<QName> relations, AjaxRequestTarget target) {
-					deleteMembersPerformed(type, scope, relations, target);
+			protected void okPerformed(QName type, Collection<QName> relations, AjaxRequestTarget target) {
+				deleteMembersPerformed(type, scope, relations, target);
 
-				}
+			}
 
-				;
-			};
+			@Override
+			protected boolean isFocusTypeSelectorVisible() {
+				return !QueryScope.SELECTED.equals(scope);
+			}
 
-			getPageBase().showMainPopup(chooseTypePopupContent, target);
-		}
+		};
+
+		getPageBase().showMainPopup(chooseTypePopupContent, target);
+
 	}
 
 	protected void createFocusMemberPerformed(AjaxRequestTarget target) {

gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties

@@ -582,6 +582,7 @@ multiplicityContainer.label.multiplicity=Násobnost
 MultiplicityPolicyDialog.label=Konfigurace násobného omezení
 MultiplicityPolicyDialog.message.badUpdate=Nepodařilo se zobrazit konfiguraci prázdného násobného omezení.
 MultiplicityPolicyDialog.message.invalidMultiplicity=Chybná hodnota násobku. Nastavte číselnou hodnotu (0, 1, ...) nebo hodnotu 'unbounded' (použijte zaškrtávací políčko)
+MultivalueContainerListPanel.message.noAssignmentSelected=Nebyly vybrány žádné položky.
 MultivalueContainerListPanel.doneButton=Hotovo
 MultivalueContainerListPanel.cancelButton=Zrušit
 MultiValueField.nameNotSpecified=(Nespecifikovaný název)
@@ -1303,7 +1304,7 @@ PageCertCampaign.button.closeStage=Ukončit fázi
 PageCertCampaign.button.openNextStage=Otevřít další fázi
 PageCertCampaign.button.startCampaign=Spustit kampaň
 PageCertCampaign.button.startRemediation=Spustit remediaci
-PageCertCampaign.iteration=Opakování
+PageCertCampaign.iteration=Iterace
 PageCertCampaign.currentState=Aktuální stav
 PageCertCampaign.description=Popis
 PageCertCampaign.menu.accept=Přijmout
@@ -1354,7 +1355,7 @@ PageCertCampaigns.table.description=Popis
 PageCertCampaigns.table.name=Název
 PageCertCampaigns.table.stages=Fáze
 PageCertCampaigns.table.stage=Fáze
-PageCertCampaigns.table.iteration=Opakování
+PageCertCampaigns.table.iteration=Iterace
 PageCertCampaigns.table.state=Stav
 PageCertCampaigns.search.state=Stav
 PageCertCampaign.stageTime=Čas fáze
@@ -1407,7 +1408,7 @@ PageCertDecisions.message.noItemSelected=Nebyly vybrány žádné položky
 PageCertDecisions.now=Nyní
 PageCertDecisions.table.campaignName=Název kampaně
 PageCertDecisions.table.campaignStage=Fáze
-PageCertDecisions.table.iteration=Opakování
+PageCertDecisions.table.iteration=Iterace
 PageCertDecisions.table.escalation=Eskalace
 PageCertDecisions.table.comment=Komentář
 PageCertDecisions.table.deadline=Uzávěrka
@@ -2398,7 +2399,7 @@ PageCaseWorkItem.case.closeTimestamp=Časová značka uzavření
 PageCaseWorkItem.case.state=Stav
 PageCaseWorkItem.caseWorkItem=Pracovní položka případu
 PageCaseWorkItem.caseWorkItem.name=Název
-PageCaseWorkItem.caseWorkItem.assignees=Řešitel(é)
+PageCaseWorkItem.caseWorkItem.assignees=Řešitel
 PageCaseWorkItem.caseWorkItem.originalAssignee=Původní řešitel
 PageCaseWorkItem.caseWorkItem.closeTimestamp=Časová značka uzavření
 PageCaseWorkItem.caseWorkItem.deadline=Uzávěrka
@@ -2550,6 +2551,7 @@ PrismObjectPanel.addChildContainer=Vložit podřízený kontejner
 PrismObjectPanel.deleteContainer=Odebrat hodnotu kontejneru
 PrismObjectPanel.showMetadata=Zobrazit metadata
 PrismObjectPanel.hideMetadata=Skrýt metadata
+PrismObjectPanel.expandCollapseContainer=Rozbalit/sbalit všechny vlastnosti
 prismOptionButtonPanel.hideEmpty=Skrýt prázdné položky
 prismOptionButtonPanel.maximize=Maximalizovat
 prismOptionButtonPanel.minimize=Minimalizovat
@@ -2813,7 +2815,7 @@ SchemaHandlingStep.label.dependency=Závislosti
 SchemaHandlingStep.label.description=Popis
 SchemaHandlingStep.label.displayName=Zobrazovaný název
 SchemaHandlingStep.label.intent=Záměr
-SchemaHandlingStep.label.iteration=Opakování
+SchemaHandlingStep.label.iteration=Iterace
 SchemaHandlingStep.label.kind=Druh
 SchemaHandlingStep.label.newObjectType=Nový typ objektu
 SchemaHandlingStep.label.objectClass=Třída objektu
@@ -3282,7 +3284,7 @@ Wizard.correctErrorsFirst=Před uložením prosím opravte chyby.
 Wizard.Issues=Problémy
 Wizard.Notes=Poznámky
 WizardStep.title=
-WorkItemsPanel.actors=Řešitel(é)
+WorkItemsPanel.actors=Řešitel
 WorkItemsPanel.object=Objekt
 WorkItemsPanel.target=Cíl
 WorkItemsPanel.name=Název
@@ -3730,7 +3732,7 @@ PageEvaluateMapping.sample.OrgName=Odvození atributu z nadřazené organizace
 PageAssignmentShoppingKart.title=Žádost o přiřazení
 PageAssignmentShoppingCart.title=Žádost o přiřazení
 PageAssignmentShoppingKart.roleCatalogIsNotConfigured=Katalog rolí není dosud zkonfigurován v konfiguračnám XML souboru systému.
-RoleCatalogItemButton.assignmentsLimitReachedTitle=Nejvyšší počet požadovaných přiřazení byl dosažen ({0}). Další již nemohou být přidána.
+RoleCatalogItemButton.assignmentsLimitReachedTitle=Nejvyšší počet žádostí o přiřazení byl dosažen ({0}). Žádné další přiřazení již nemůže být přidáno/upraveno/odstraněno.
 AssignmentPanel.assignmentsLimitReachedWarning=Počet vybraných položek překračuje omezení na počet žádostí o přiřazení ({0}).
 AssignmentConflictPanel.existingAssignmentLabelMessage=(které již uživatel má)
 AssignmentConflictPanel.addedAssignmentLabelMessage=(které jsou přidány do nákupního košíku)
@@ -4096,6 +4098,14 @@ abstractRoleMemberPanel.type=Typ
 abstractRoleMemberPanel.type.tooltip=Zobrazit členy vybraného typu
 abstractRoleMemberPanel.indirectMembers=Nepřímé
 abstractRoleMemberPanel.indirectMembers.tooltip=Zda ukázat členy, kteří nejsou přiřazeni napřímo (není tedy přiřazení přímo v objektu, ale například přes další roli/organizaci)
+abstractRoleMemberPanel.recomputeAllMembersConfirmationLabel=Opravdu chcete přepočítat všechny členy?
+abstractRoleMemberPanel.recomputeSelectedMembersConfirmationLabel=Opravdu chcete přepočítat vybrané členy?
+abstractRoleMemberPanel.deleteAllMembersConfirmationLabel=Opravdu chcete odstranit všechny členy s určenými parametry?
+abstractRoleMemberPanel.deleteSelectedMembersConfirmationLabel=Opravdu chcete odstranit vybrané členy?
+abstractRoleMemberPanel.unassignAllMembersConfirmationLabel=Opravdu chcete odebrat všechny členy s určenými parametry?
+abstractRoleMemberPanel.unassignSelectedMembersConfirmationLabel=Opravdu chcete odebrat vybrané členy?
+operation.Delete.ALL_DIRECT.members=Odstranit všechny přímé členy
+operation.Delete.SELECTED.members=Odstranit vybrané členy
 relationDropDownChoicePanel.relation=Vztah
 relationDropDownChoicePanel.tooltip.relation=Vztah odkazovaného objektu, tj např schvalovatel, manažer, ...
 ItemPathPanel.button.reset=Cesta k resetu
@@ -4152,7 +4162,9 @@ TaskExecutionGroupConstraintType.details.newValue=Nová definice druhotné skupi
 PendingOperationPanel.pendingOperationType=Typ:
 PendingOperationPanel.resultStatus=Stav výsledku:
 PendingOperationPanel.executionStatus=Stav vykonávání:
+PendingOperationPanel.operationReference=Odkaz na operaci:
 PendingOperationPanel.attempt=Pokus:
 PendingOperationPanel.lastAttemptTimestamp=Poslední pokus:
 PendingOperationPanel.completionTimestamp=Dokončeno:
 pageForgetPassword.message.user.not.found=Uživatelské heslo nemohlo být zresetováno. Prosím kontaktujte správce systému.
+PageCertDefinitions.campaignWasCreated=Certifikační kampaň "{0}" byla vytvořena.

gui/admin-gui/src/main/resources/localization/Midpoint_de.properties

@@ -582,6 +582,7 @@ multiplicityContainer.label.multiplicity=Multiplizität
 MultiplicityPolicyDialog.label=Multiplizitätsvorschriften konfigurieren
 MultiplicityPolicyDialog.message.badUpdate=Leere Konfiguration der Multiplizitätsvorschriften können nicht anzeigt werden.
 MultiplicityPolicyDialog.message.invalidMultiplicity=Ungültiger Multiplizitätswert. Numerischen Wert (0,1, ...) oder 'freien' Wert (checkbox) einstellen
+MultivalueContainerListPanel.message.noAssignmentSelected=No items selected.
 MultivalueContainerListPanel.doneButton=Erledigt
 MultivalueContainerListPanel.cancelButton=Abbruch
 MultiValueField.nameNotSpecified=(Name nicht festgelegt)
@@ -2550,6 +2551,7 @@ PrismObjectPanel.addChildContainer=Add child container
 PrismObjectPanel.deleteContainer=Remove container value
 PrismObjectPanel.showMetadata=Metadaten anzeigen
 PrismObjectPanel.hideMetadata=Metadaten verstecken
+PrismObjectPanel.expandCollapseContainer=Expand/collapse all properties
 prismOptionButtonPanel.hideEmpty=Leere Felder verstecken
 prismOptionButtonPanel.maximize=Maximieren
 prismOptionButtonPanel.minimize=Minimieren
@@ -4096,6 +4098,14 @@ abstractRoleMemberPanel.type=Typ
 abstractRoleMemberPanel.type.tooltip=Show members of selected type
 abstractRoleMemberPanel.indirectMembers=Indirekt
 abstractRoleMemberPanel.indirectMembers.tooltip="Whether to show members which are not assigned directly (there is no assignment in the object)"
+abstractRoleMemberPanel.recomputeAllMembersConfirmationLabel=Do you really want to recompute all members?
+abstractRoleMemberPanel.recomputeSelectedMembersConfirmationLabel=Do you really want to recompute selected members?
+abstractRoleMemberPanel.deleteAllMembersConfirmationLabel=Do you really want to delete all members with specified parameters?
+abstractRoleMemberPanel.deleteSelectedMembersConfirmationLabel=Do you really want to delete selected members?
+abstractRoleMemberPanel.unassignAllMembersConfirmationLabel=Do you really want to unassign all members with specified parameters?
+abstractRoleMemberPanel.unassignSelectedMembersConfirmationLabel=Do you really want to unassign selected members?
+operation.Delete.ALL_DIRECT.members=Delete all direct members
+operation.Delete.SELECTED.members=Delete selected members
 relationDropDownChoicePanel.relation=Beziehung
 relationDropDownChoicePanel.tooltip.relation=Relation of the reference, e.g. default, approver, manager,...
 ItemPathPanel.button.reset=Reset path
@@ -4152,7 +4162,9 @@ TaskExecutionGroupConstraintType.details.newValue=New secondary execution group
 PendingOperationPanel.pendingOperationType=Typ:
 PendingOperationPanel.resultStatus=Result status:
 PendingOperationPanel.executionStatus=Execution status:
+PendingOperationPanel.operationReference=Operation reference:
 PendingOperationPanel.attempt=Attempt:
 PendingOperationPanel.lastAttemptTimestamp=Last attempt:
 PendingOperationPanel.completionTimestamp=Completed:
 pageForgetPassword.message.user.not.found=Reset password failed. Please contact system administrator.
+PageCertDefinitions.campaignWasCreated=Certification campaign "{0}" was created.

gui/admin-gui/src/main/resources/localization/Midpoint_en.properties

@@ -582,6 +582,7 @@ multiplicityContainer.label.multiplicity=Multiplicity
 MultiplicityPolicyDialog.label=Configure multiplicity constraints
 MultiplicityPolicyDialog.message.badUpdate=Can't show empty multiplicity constraints config.
 MultiplicityPolicyDialog.message.invalidMultiplicity=Invalid multiplicity value. Set numeric value (0, 1, ...) or value 'unbounded' (use checkbox)
+MultivalueContainerListPanel.message.noAssignmentSelected=No items selected.
 MultivalueContainerListPanel.doneButton=Done
 MultivalueContainerListPanel.cancelButton=Cancel
 MultiValueField.nameNotSpecified=(Name not specified)
@@ -2364,7 +2365,7 @@ pageUsers.message.deleteAction=delete
 pageUsers.message.confirmActionPopupTitle=Confirm action
 pageUsers.message.nothingSelected=No user has been selected.
 pageUsers.message.queryError=Error occurred during translation search query to filter.
-PageUsers.title=User List
+PageUsers.title=Users List
 pageUser.task.category=Category
 pageUser.task.execution=Execution state
 pageUser.task.name=Task name
@@ -2550,6 +2551,7 @@ PrismObjectPanel.addChildContainer=Add child container
 PrismObjectPanel.deleteContainer=Remove container value
 PrismObjectPanel.showMetadata=Show metadata
 PrismObjectPanel.hideMetadata=Hide metadata
+PrismObjectPanel.expandCollapseContainer=Expand/collapse all properties
 prismOptionButtonPanel.hideEmpty=Hide empty fields
 prismOptionButtonPanel.maximize=Maximize
 prismOptionButtonPanel.minimize=Minimize
@@ -4096,6 +4098,14 @@ abstractRoleMemberPanel.type=Type
 abstractRoleMemberPanel.type.tooltip=Show members of selected type
 abstractRoleMemberPanel.indirectMembers=Indirect
 abstractRoleMemberPanel.indirectMembers.tooltip="Whether to show members which are not assigned directly (there is no assignment in the object)"
+abstractRoleMemberPanel.recomputeAllMembersConfirmationLabel=Do you really want to recompute all members?
+abstractRoleMemberPanel.recomputeSelectedMembersConfirmationLabel=Do you really want to recompute selected members?
+abstractRoleMemberPanel.deleteAllMembersConfirmationLabel=Do you really want to delete all members with specified parameters?
+abstractRoleMemberPanel.deleteSelectedMembersConfirmationLabel=Do you really want to delete selected members?
+abstractRoleMemberPanel.unassignAllMembersConfirmationLabel=Do you really want to unassign all members with specified parameters?
+abstractRoleMemberPanel.unassignSelectedMembersConfirmationLabel=Do you really want to unassign selected members?
+operation.Delete.ALL_DIRECT.members=Delete all direct members
+operation.Delete.SELECTED.members=Delete selected members
 relationDropDownChoicePanel.relation=Relation
 relationDropDownChoicePanel.tooltip.relation=Relation of the reference, e.g. default, approver, manager,...
 ItemPathPanel.button.reset=Reset path
@@ -4152,7 +4162,9 @@ TaskExecutionGroupConstraintType.details.newValue=New secondary execution group
 PendingOperationPanel.pendingOperationType=Type:
 PendingOperationPanel.resultStatus=Result status:
 PendingOperationPanel.executionStatus=Execution status:
+PendingOperationPanel.operationReference=Operation reference:
 PendingOperationPanel.attempt=Attempt:
 PendingOperationPanel.lastAttemptTimestamp=Last attempt:
 PendingOperationPanel.completionTimestamp=Completed:
 pageForgetPassword.message.user.not.found=Reset password failed. Please contact system administrator.
+PageCertDefinitions.campaignWasCreated=Certification campaign "{0}" was created.