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

Evolveum · Mar 31, 2015 · fb2e9e2 · fb2e9e2
2 parents a7cf7ec + 73b7752
commit fb2e9e2
Show file tree

Hide file tree

Showing 14 changed files with 686 additions and 375 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ValueWrapper.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/ValueWrapper.java
@@ -18,6 +18,8 @@
 
 import com.evolveum.midpoint.prism.PrismPropertyValue;
 import com.evolveum.midpoint.prism.polystring.PolyString;
+import com.evolveum.midpoint.util.DisplayableValue;
+
 import org.apache.commons.lang.Validate;
 
 import java.io.Serializable;
@@ -96,6 +98,9 @@ public void normalize() {
             if (poly.getOrig()==null) {
                 value.setValue((T) new PolyString(""));
             }
+        } else if (value.getValue() instanceof DisplayableValue){
+        	DisplayableValue displayableValue = (DisplayableValue) value.getValue();
+        	value.setValue((T) displayableValue.getValue());
         }
     }
 

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java b/...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageDebugView.java
@@ -41,6 +41,7 @@
 import com.evolveum.midpoint.web.page.admin.dto.ObjectViewDto;
 import com.evolveum.midpoint.web.security.MidPointApplication;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.LookupTableType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ReportType;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.UserType;
@@ -129,10 +130,17 @@ private ObjectViewDto loadObject() {
             if (objectType != null && StringUtils.isNotBlank(objectType.toString())){
             	type = getPrismContext().getSchemaRegistry().determineCompileTimeClass(new QName(SchemaConstantsGenerated.NS_COMMON, objectType.toString()));
             }
+
             if (UserType.class.isAssignableFrom(type)) {
                 options.add(SelectorOptions.create(UserType.F_JPEG_PHOTO,
                         GetOperationOptions.createRetrieve(RetrieveOption.INCLUDE)));
             }
+
+            if(objectType != null && LookupTableType.COMPLEX_TYPE.getLocalPart().equals(objectType.toString())){
+                options.add(SelectorOptions.create(LookupTableType.F_ROW,
+                        GetOperationOptions.createRetrieve(RetrieveOption.INCLUDE)));
+            }
+
             PrismObject<ObjectType> object = getModelService().getObject(type, objectOid.toString(), options, task, result);
 
             PrismContext context = application.getPrismContext();

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
@@ -427,10 +427,10 @@ public PrismObject<UserType> getObject() {
             }
         };
 
-        summaryContainer.add(new Label(ID_SUMMARY_NAME, new PrismPropertyModel<UserType>(summaryUser, UserType.F_NAME)));
-        summaryContainer.add(new Label(ID_SUMMARY_FULL_NAME, new PrismPropertyModel<UserType>(summaryUser, UserType.F_FULL_NAME)));
-        summaryContainer.add(new Label(ID_SUMMARY_GIVEN_NAME, new PrismPropertyModel<UserType>(summaryUser, UserType.F_GIVEN_NAME)));
-        summaryContainer.add(new Label(ID_SUMMARY_FAMILY_NAME, new PrismPropertyModel<UserType>(summaryUser, UserType.F_FAMILY_NAME)));
+        summaryContainer.add(new Label(ID_SUMMARY_NAME, new PrismPropertyModel<>(summaryUser, UserType.F_NAME)));
+        summaryContainer.add(new Label(ID_SUMMARY_FULL_NAME, new PrismPropertyModel<>(summaryUser, UserType.F_FULL_NAME)));
+        summaryContainer.add(new Label(ID_SUMMARY_GIVEN_NAME, new PrismPropertyModel<>(summaryUser, UserType.F_GIVEN_NAME)));
+        summaryContainer.add(new Label(ID_SUMMARY_FAMILY_NAME, new PrismPropertyModel<>(summaryUser, UserType.F_FAMILY_NAME)));
 
         Image img = new Image(ID_SUMMARY_PHOTO, new AbstractReadOnlyModel<AbstractResource>() {
 
@@ -1026,6 +1026,11 @@ protected void handlePartialError(OperationResult result) {
             protected void addPerformed(AjaxRequestTarget target, List<ObjectType> selected) {
                 addSelectedAssignablePerformed(target, selected, MODAL_ID_ASSIGNABLE);
             }
+
+            @Override
+            protected PrismObject<UserType> getUserDefinition() {
+                return userModel.getObject().getObject();
+            }
         });
         add(window);
 

diff --git a/...java/com/evolveum/midpoint/web/page/admin/users/component/AssignableRolePopupContent.html b/...java/com/evolveum/midpoint/web/page/admin/users/component/AssignableRolePopupContent.html
@@ -23,6 +23,10 @@
             <form wicket:id="searchForm" class="form-inline pull-right"
                   style="padding: 5px;">
 
+                <div class="form-group">
+                    <select class="form-control input-sm" wicket:id="typeSelect" />
+                </div>
+
                 <div wicket:id="basicSearch" />
             </form>
         </div>