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

Evolveum · Jun 17, 2016 · 5b5e33b · 5b5e33b
2 parents 0eccbce + 59eeef7
commit 5b5e33b
Show file tree

Hide file tree

Showing 15 changed files with 340 additions and 56 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
@@ -479,14 +479,15 @@ public Object getDisplayValue(Object object) {
 
 			@Override
 			public String getIdValue(Object object, int index) {
-				return String.valueOf(index);
-				// for (DisplayableValue v : enumModelValues.getObject()){
-				// if (object.equals(v.getValue())){
-				// return v.getLabel();
-				// }
-				// }
-				// return
-				// object.getValue().toString();//Integer.toString(index);
+                if (object instanceof String && enumModelValues != null && enumModelValues.getObject() != null) {
+                    List<DisplayableValue> enumValues = enumModelValues.getObject();
+                    for (DisplayableValue v : enumValues) {
+                        if (object.equals(v.getValue())) {
+                            return String.valueOf(enumValues.indexOf(v));
+                        }
+                    }
+                }
+                return String.valueOf(index);
 			}
 
 		}, true);

diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.java
@@ -323,7 +323,7 @@ private void savePerformed(boolean raw, String operationName, AjaxRequestTarget
 		}
 
 		showResult(result);
-		target.add(getFeedbackPanel());
+		target.add(PageImportObject.this);
 	}
 
 

diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.html b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgMemberPanel.html
@@ -29,9 +29,9 @@ <h3 class="box-title"><wicket:message key="TreeTablePanel.managers"/></h3>
 			<div class="box-body">
                 <div class="col-md-12" wicket:id="managerTable">
 					<div class="manager-tools">
-						<a wicket:id="editManager" class="manager-btn btn-primary fa fa-edit"></a>
-						<a wicket:id="removeManager" class="manager-btn btn-warning fa fa-unlink"></a>
-						<a wicket:id="deleteManager" class="manager-btn btn-danger fa fa-times"></a>
+						<a wicket:id="editManager" class="manager-btn btn-primary fa fa-edit" wicket:message="title:OrgMemberPanel.editUserTitle"></a>
+						<a wicket:id="removeManager" class="manager-btn btn-warning fa fa-unlink" wicket:message="title:OrgMemberPanel.unlinkTitle"></a>
+						<a wicket:id="deleteManager" class="manager-btn btn-danger fa fa-times" wicket:message="title:OrgMemberPanel.deleteTitle"></a>
 					</div>
 					<div wicket:id="managerSummary" />
 				</div>

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/workflow/dto/WorkItemDto.java
@@ -130,7 +130,7 @@ public String getCreatedFormatted() {
     }
 
 	public String getCreatedFormattedFull() {
-		return WebComponentUtil.getLocalizedDate(workItem.getWorkItemCreatedTimestamp(), DateLabelComponent.FULL_FULL_STYLE);
+		return WebComponentUtil.getLocalizedDate(workItem.getWorkItemCreatedTimestamp(), DateLabelComponent.FULL_MEDIUM_STYLE);
 	}
 
 	public Date getCreatedDate() {
@@ -142,7 +142,7 @@ public Date getStartedDate() {
     }
 
     public String getStartedFormattedFull() {
-        return WebComponentUtil.getLocalizedDate(workItem.getProcessStartedTimestamp(), DateLabelComponent.FULL_FULL_STYLE);
+        return WebComponentUtil.getLocalizedDate(workItem.getProcessStartedTimestamp(), DateLabelComponent.FULL_MEDIUM_STYLE);
     }
 
     public String getAssigneeOrCandidates() {

diff --git a/gui/admin-gui/src/main/resources/initial-objects/020-system-configuration.xml b/gui/admin-gui/src/main/resources/initial-objects/020-system-configuration.xml
@@ -25,6 +25,10 @@
     <globalPasswordPolicyRef oid="00000000-0000-0000-0000-000000000003" type="c:ValuePolicyType"/>
     <globalSecurityPolicyRef oid="00000000-0000-0000-0000-000000000120"/>
     <logging>
+        <classLogger>
+            <level>ERROR</level>
+            <package>ro.isdc.wro.extensions.processor.css.Less4jProcessor</package>
+        </classLogger>
         <classLogger>
             <!-- disabled because of MID-744, helper insert messages on ERROR
             level which should not be there (probably should be on TRACE) -->

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -3156,3 +3156,6 @@ PageResourceVisualization.errorMessage=Error message:
 PageResourceVisualization.seeOnline=You can also try to use an online DOT renderer, for example
 PageResourceVisualization.seeOnlineLink=webgraphviz.com
 PageResourceVisualization.copyInstruction=Simply paste the following DOT code into it.
+OrgMemberPanel.editUserTitle=Edit manager
+OrgMemberPanel.unlinkTitle=Unlink manager
+OrgMemberPanel.deleteTitle=Delete manager
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
@@ -3072,3 +3072,6 @@ OrgTreeAssignablePanel.selectOrg=Select organization(s)
 ChooseFocusTypeDialogPanel.chooseType=Choose type
 TestConnectionResultPanel.testConnection.result=Test connection result(s)
 operation.com.evolveum.midpoint.web.page.admin.configuration.PageSystemConfiguration.updateSystemConfiguration=Update system configuration (GUI)
+OrgMemberPanel.editUserTitle=Edit manager
+OrgMemberPanel.unlinkTitle=Unlink manager
+OrgMemberPanel.deleteTitle=Delete manager
diff --git a/gui/admin-gui/src/main/resources/logback.xml b/gui/admin-gui/src/main/resources/logback.xml
@@ -55,6 +55,7 @@
     </appender>
     <!-- Appender for profiling purposes -->
 
+    <logger name="ro.isdc.wro.extensions.processor.css.Less4jProcessor" level="ERROR"/>
     <logger name="org.hibernate.engine.jdbc.spi.SqlExceptionHelper" level="OFF"/>
     <logger name="org.hibernate.engine.jdbc.batch.internal.BatchingBatch" level="OFF"/>
     <logger name="PROFILING" level="INFO"/>

diff --git a/infra/schema/src/main/resources/localization/schema.properties b/infra/schema/src/main/resources/localization/schema.properties
@@ -379,3 +379,4 @@ ResourceValidator.duplicateReactions=Duplicate reactions defined in ''{0}'' for
 ResourceValidator.noSituation=Missing synchronization situation name in a reaction defined in ''{0}''
 ResourceValidator.outboundMapping=outbound mapping
 ResourceValidator.inboundMapping=inbound mapping number {0}
+AdminGuiConfigurationType.adminGuiConfiguration=Admin GUI Configuration
diff --git a/infra/schema/src/main/resources/localization/schema_en.properties b/infra/schema/src/main/resources/localization/schema_en.properties
@@ -325,3 +325,4 @@ ServiceType.type=Type
 ServiceType.locality=Locality
 ServiceType.displayOrder=Display Order
 ServiceType.URL=URL
+AdminGuiConfigurationType.adminGuiConfiguration=Admin GUI Configuration
diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
@@ -7300,6 +7300,7 @@
 							</xsd:documentation>
 							<xsd:appinfo>
 								<a:since>3.4</a:since>
+                                <a:displayName>AdminGuiConfigurationType.adminGuiConfiguration</a:displayName>
 							</xsd:appinfo>
 						</xsd:annotation>
 					</xsd:element>
@@ -9148,6 +9149,9 @@
                             <xsd:documentation>
                                 Administration GUI configuration.
                             </xsd:documentation>
+                            <xsd:appinfo>
+                                <a:displayName>AdminGuiConfigurationType.adminGuiConfiguration</a:displayName>
+                            </xsd:appinfo>
                         </xsd:annotation>
                     </xsd:element>
                 </xsd:sequence>