adding display names

Evolveum · Aug 14, 2018 · 055e718 · 055e718
1 parent d5eea26
commit 055e718
Show file tree

Hide file tree

Showing 11 changed files with 859 additions and 73 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -2507,4 +2507,19 @@ public List<Boolean> getObject() {
 			}
 		};
 	}
+
+	public static LookupTableType createAppenderChoices(PageBase pageBase) {
+		LookupTableType lookupTable = new LookupTableType();
+        List<LookupTableRowType> list = lookupTable.createRowList();
+
+        for (AppenderConfigurationType appender : WebModelServiceUtils.loadSystemConfigurationAsObjectWrapper(pageBase).getObject().getRealValue().getLogging().getAppender()) {
+        		LookupTableRowType row = new LookupTableRowType();
+        		String name = appender.getName();
+        		row.setKey(name);
+        		row.setValue(name);
+        		row.setLabel(new PolyStringType(name));
+        		list.add(row);
+        }
+        return lookupTable;
+	}
 }
diff --git a/...um/midpoint/gui/impl/page/admin/configuration/component/LoggingConfigurationTabPanel.java b/...um/midpoint/gui/impl/page/admin/configuration/component/LoggingConfigurationTabPanel.java
@@ -278,6 +278,9 @@ public ContainerWrapper<AuditingConfigurationType> getObject() {
     		}
 
     	};
+
+
+
 		PrismContainerPanel<AuditingConfigurationType> auditPanel = new PrismContainerPanel<AuditingConfigurationType>(ID_AUDITING, auditModel, true, new Form<>("form"), null, getPageBase());
     	add(auditPanel);
 
@@ -334,8 +337,11 @@ public void onClick(AjaxRequestTarget target, IModel<ContainerValueWrapper<Class
 				loggerEditPerformed(target, rowModel, null);
 			}
 		});
+
 		columns.add(new EditablePropertyWrapperColumn<ClassLoggerConfigurationType, String>(createStringResource("LoggingConfigurationTabPanel.loggers.level"), ClassLoggerConfigurationType.F_LEVEL, getPageBase()));
+
 		columns.add(new EditablePropertyWrapperColumn<ClassLoggerConfigurationType, String>(createStringResource("LoggingConfigurationTabPanel.loggers.appender"), ClassLoggerConfigurationType.F_APPENDER, getPageBase()));
+
 		List<InlineMenuItem> menuActionsList = getLoggersMultivalueContainerListPanel().getDefaultMenuActions();
 		columns.add(new InlineMenuButtonColumn<>(menuActionsList, menuActionsList.size(), getPageBase()));
 

diff --git a/...veum/midpoint/gui/impl/page/admin/configuration/component/NotificationConfigTabPanel.java b/...veum/midpoint/gui/impl/page/admin/configuration/component/NotificationConfigTabPanel.java
@@ -439,7 +439,7 @@ protected Component createInputPanel(String componentId, IModel<MailServerConfig
 
 			@Override
         	protected Component createStaticPanel(String componentId, IModel<MailServerConfiguration> rowModel) {
-        		return new Label(componentId, Model.of(rowModel.getObject().getValue().getTransportSecurity().value()));
+        		return new Label(componentId, Model.of(WebComponentUtil.createLocalizedModelForEnum(rowModel.getObject().getValue().getTransportSecurity(), null)));//rowModel.getObject().getClass().getName() + "." + rowModel.getObject().getValue().getTransportSecurity().value()));
         	}
 
         	@Override

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyColumn.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyColumn.java
@@ -81,18 +81,9 @@ public PrismPropertyColumn(String id, final IModel<IW> model, Form form, PageBas
         LOGGER.trace("Creating property panel for {}", model.getObject());
 
         if(model.getObject().getPath().removeIdentifiers().equivalent(new ItemPath(SystemConfigurationType.F_LOGGING, LoggingConfigurationType.F_CLASS_LOGGER, ClassLoggerConfigurationType.F_APPENDER))){
-        	LookupTableType lookupTable = new LookupTableType();
-	        List<LookupTableRowType> list = lookupTable.createRowList();
 
-	        for (AppenderConfigurationType appender : WebModelServiceUtils.loadSystemConfigurationAsObjectWrapper(pageBase).getObject().getRealValue().getLogging().getAppender()) {
-	        		LookupTableRowType row = new LookupTableRowType();
-	        		String name = appender.getName();
-	        		row.setKey(name);
-	        		row.setValue(name);
-	        		row.setLabel(new PolyStringType(name));
-	        		list.add(row);
-	        }
-	        ((PropertyWrapper)model.getObject()).setPredefinedValues(lookupTable);
+        	((PropertyWrapper)model.getObject()).setPredefinedValues(WebComponentUtil.createAppenderChoices(pageBase));
+
         } else if(model.getObject().getPath().removeIdentifiers().equivalent(new ItemPath(SystemConfigurationType.F_LOGGING, LoggingConfigurationType.F_CLASS_LOGGER, ClassLoggerConfigurationType.F_PACKAGE))){
         	LookupTableType lookupTable = new LookupTableType();
 	        List<LookupTableRowType> list = lookupTable.createRowList();

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
@@ -694,13 +694,17 @@ protected AttributeAppender getSpecificLabelStyleAppender() {
 				// }
 
 				PrismPropertyDefinition def = property.getDefinition();
+
+				if(getModelObject().getItem() instanceof PropertyWrapper && getModelObject().getItem().getPath().removeIdentifiers().equivalent(new ItemPath(SystemConfigurationType.F_LOGGING, LoggingConfigurationType.F_AUDITING, AuditingConfigurationType.F_APPENDER))){
+					((PropertyWrapper)getModelObject().getItem()).setPredefinedValues(WebComponentUtil.createAppenderChoices(getPageBase()));
+				}
 
 				if(getModelObject().getItem() instanceof PropertyWrapper && ((PropertyWrapper)getModelObject().getItem()).getPredefinedValues() != null) {
 					LookupTableType lookupTable = ((PropertyWrapper)getModelObject().getItem()).getPredefinedValues();
 
 					boolean isStrict = true;
 					if(getModelObject().getItem().getName().equals(ClassLoggerConfigurationType.F_PACKAGE)) {
-						isStrict=false;
+						isStrict = false;
 					}
 
 					panel = new AutoCompleteTextPanel<String>(id, new LookupPropertyModel<>(getModel(),