few small fixes in wizard.

Evolveum · Feb 9, 2015 · f444ba6 · f444ba6
1 parent 557bbcc
commit f444ba6
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/Wizard.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/Wizard.java
@@ -212,6 +212,6 @@ private void changeStep(AjaxRequestTarget target, WizardStepDto dto){
             onActiveStepChanged(newStep);
         }
 
-        target.add(this);
+        target.add(this, getPageBase().getFeedbackPanel());
     }
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/WizardStep.java
@@ -111,10 +111,11 @@ protected List<QName> loadResourceObjectClassList(IModel<PrismObject<ResourceTyp
 
         try {
             ResourceSchema schema = RefinedResourceSchema.getResourceSchema(model.getObject(), getPageBase().getPrismContext());
-            schema.getObjectClassDefinitions();
 
-            for(Definition def: schema.getDefinitions()){
-                list.add(def.getTypeName());
+            if(schema != null){
+                for(Definition def: schema.getDefinitions()){
+                    list.add(def.getTypeName());
+                }
             }
 
         } catch (Exception e){

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
@@ -273,7 +273,11 @@ protected String load() {
                     return createStringResource("pageUser.subTitle.newUser").getObject();
                 }
 
-                String name = userModel.getObject().getObject().asObjectable().getName().getOrig();
+                String name = null;
+                if(userModel != null && userModel.getObject() != null && userModel.getObject().getObject() != null){
+                    name = WebMiscUtil.getName(userModel.getObject().getObject());
+                }
+
                 return createStringResource("pageUser.subTitle.edituser", name).getObject();
             }
         };