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

Evolveum · Mar 12, 2019 · a5f04dc · a5f04dc
2 parents 4e6acc0 + 1b74520
commit a5f04dc
Show file tree

Hide file tree

Showing 28 changed files with 226 additions and 188 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
@@ -15,20 +15,17 @@
  */
 package com.evolveum.midpoint.web.component.data.column;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
+import com.evolveum.midpoint.gui.api.GuiStyleConstants;
 import com.evolveum.midpoint.gui.api.page.PageBase;
-import com.evolveum.midpoint.model.api.AssignmentCandidatesSpecification;
+import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
+import com.evolveum.midpoint.prism.PrismProperty;
+import com.evolveum.midpoint.prism.path.ItemPath;
+import com.evolveum.midpoint.schema.constants.SchemaConstants;
 import com.evolveum.midpoint.schema.result.OperationResult;
+import com.evolveum.midpoint.schema.util.ShadowUtil;
+import com.evolveum.midpoint.web.component.util.SelectableBean;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
-import com.evolveum.midpoint.prism.path.ItemPath;
 import org.apache.commons.lang.StringUtils;
-import org.apache.wicket.Component;
 import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
@@ -42,12 +39,11 @@
 import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.model.StringResourceModel;
 
-import com.evolveum.midpoint.gui.api.GuiStyleConstants;
-import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-import com.evolveum.midpoint.prism.PrismProperty;
-import com.evolveum.midpoint.schema.constants.SchemaConstants;
-import com.evolveum.midpoint.schema.util.ShadowUtil;
-import com.evolveum.midpoint.web.component.util.SelectableBean;
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
 
 public class ColumnUtils {
 
@@ -157,15 +153,15 @@ public IModel<String> getDataModel(IModel<SelectableBean<O>> rowModel) {
 
 	}
 
-	private static <T extends ObjectType> String getIconColumnValue(IModel<SelectableBean<T>> rowModel){
-		T object = rowModel.getObject().getValue();
-		if (object == null){
+	private static <T extends ObjectType> String getIconColumnValue(IModel<SelectableBean<T>> rowModel) {
+		if (rowModel == null || rowModel.getObject() == null || rowModel.getObject().getValue() == null) {
 			return "";
 		}
-		Class<T> type = (Class<T>)rowModel.getObject().getValue().getClass();
-		if (object == null && !ShadowType.class.equals(type)){
-			return null;
-		} else if (type.equals(ObjectType.class)){
+
+		T object = rowModel.getObject().getValue();
+
+		Class<T> type = (Class<T>) object.getClass();
+		if (type.equals(ObjectType.class)) {
 			return WebComponentUtil.createDefaultIcon(object.asPrismObject());
 		} else if (type.equals(UserType.class)) {
 			return WebComponentUtil.createUserIcon(object.asPrismContainer());
@@ -174,7 +170,7 @@ private static <T extends ObjectType> String getIconColumnValue(IModel<Selectabl
 		} else if (OrgType.class.equals(type)) {
 			return WebComponentUtil.createOrgIcon(object.asPrismContainer());
 		} else if (ServiceType.class.equals(type)) {
-			return WebComponentUtil.createServiceIcon(object.asPrismContainer()) ;
+			return WebComponentUtil.createServiceIcon(object.asPrismContainer());
 		} else if (ShadowType.class.equals(type)) {
 			if (object == null) {
 				return WebComponentUtil.createErrorIcon(rowModel.getObject().getResult());
@@ -187,11 +183,9 @@ private static <T extends ObjectType> String getIconColumnValue(IModel<Selectabl
 			return WebComponentUtil.createResourceIcon(object.asPrismContainer());
 		} else if (type.equals(AccessCertificationDefinitionType.class)) {
 			return GuiStyleConstants.CLASS_OBJECT_CERT_DEF_ICON + " " + GuiStyleConstants.CLASS_ICON_STYLE_NORMAL;
-		} else {
-			return "";
-//			throw new UnsupportedOperationException("Will be implemented eventually");
 		}
 
+		return "";
 	}
 
 	private static <T extends ObjectType> IModel<String> getIconColumnDataModel(IModel<SelectableBean<T>> rowModel){

diff --git a/gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml b/gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
@@ -110,7 +110,7 @@ AssignmentPreviewDialog.label=Zobrazit přímá i nepřímá přiřazení
 AssignmentPreviewDialog.delegationPreviewLabel=Omezit výsady
 AssignmentPreviewDialog.type.direct=Přímé
 AssignmentPreviewDialog.type.indirect=Nepřímé
-AssignmentPreviewDialog.tooltip.indirect.parent=Předchůdce
+AssignmentPreviewDialog.tooltip.indirect.parent=Nadřazený
 AssignmentTablePanel.menu.assign=Přidat přiřazení
 AssignmentTablePanel.menu.assignOrg=Přiřadit organizaci
 AssignmentTablePanel.menu.assignOrg.noorgs=Organizační struktura není definovaná.
@@ -3605,7 +3605,7 @@ PageAdmin.menu.top.services=Služby
 PageAdmin.menu.top.services.list=Všechny služby
 PageAdmin.menu.top.services.new=Nová služba
 PageAdmin.menu.top.services.edit=Upravit službu
-taskShowAdvancedFeaturesPanel.label=Zobrazit rozšířené rysy
+taskShowAdvancedFeaturesPanel.label=Zobrazit rozšířené funkce
 taskWfParentPanel.changesNotRequiringApproval=Změny, které nevyžadují schválení
 taskOtherChangesPanel.label.state=Stav:
 taskOtherChangesPanel.state.FINAL=Změny byly provedeny (úspěšně či neúspěšně)

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_de.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
@@ -110,6 +110,7 @@ AssignmentPreviewDialog.label=Direkte und indirekte Zuweisungen anzeigen
 AssignmentPreviewDialog.delegationPreviewLabel=Privilegien limitieren
 AssignmentPreviewDialog.type.direct=Direkt
 AssignmentPreviewDialog.type.indirect=Indirekt
+AssignmentPreviewDialog.tooltip.indirect.parent=übergeordnet
 AssignmentTablePanel.menu.assign=Ressource zuweisen
 AssignmentTablePanel.menu.assignOrg=Organisation zuweisen
 AssignmentTablePanel.menu.assignOrg.noorgs=Es wurde keine Organisationsstruktur definiert.

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_es.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
@@ -110,6 +110,7 @@ AssignmentPreviewDialog.label=Ver asignaciones directas e indirectas
 AssignmentPreviewDialog.delegationPreviewLabel=Limitar privilegios
 AssignmentPreviewDialog.type.direct=Directo
 AssignmentPreviewDialog.type.indirect=Indirecto
+AssignmentPreviewDialog.tooltip.indirect.parent=Padre
 AssignmentTablePanel.menu.assign=Asignar miembros
 AssignmentTablePanel.menu.assignOrg=Asignar Org.
 AssignmentTablePanel.menu.assignOrg.noorgs=La estructura organizativa no está definida.

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_et.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
@@ -110,6 +110,7 @@ AssignmentPreviewDialog.label=Vaata otseseid ja kaudseid omistusi
 AssignmentPreviewDialog.delegationPreviewLabel=Piiritle õigused
 AssignmentPreviewDialog.type.direct=Otsene
 AssignmentPreviewDialog.type.indirect=Kaudne
+AssignmentPreviewDialog.tooltip.indirect.parent=Parent
 AssignmentTablePanel.menu.assign=Omista
 AssignmentTablePanel.menu.assignOrg=Omista Org.
 AssignmentTablePanel.menu.assignOrg.noorgs=Organisatsiooni struktuuri pole määratletud.

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_fi.properties
@@ -110,6 +110,7 @@ AssignmentPreviewDialog.label=Tarkastele suoria ja epäsuoria toimeksiantoja
 AssignmentPreviewDialog.delegationPreviewLabel=Rajoita etuoikeuksia
 AssignmentPreviewDialog.type.direct=Suora
 AssignmentPreviewDialog.type.indirect=Epäsuora
+AssignmentPreviewDialog.tooltip.indirect.parent=ylähakemisto
 AssignmentTablePanel.menu.assign=Osoita
 AssignmentTablePanel.menu.assignOrg=Osoita Org.
 AssignmentTablePanel.menu.assignOrg.noorgs=Organisaatio rakennetta ei tarkennettu.