attempt to fix npe in role catalog, some improvements

Evolveum · Feb 21, 2017 · dfaa312 · dfaa312
1 parent c54bda8
commit dfaa312
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/.../src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.html b/.../src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.html
@@ -44,7 +44,7 @@
     </div>
 
     <div wicket:id="catalogItemsPanelContainer" class="row">
-        <div wicket:id="treePanelContainer">
+        <div wicket:id="treePanelContainer" style="margin-top: 10px;">
             <div wicket:id="treePanel"/>
         </div>
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.html
@@ -22,7 +22,8 @@
     <form wicket:id="mainForm" class="form-horizontal">
         <div wicket:id="assignmentTablePanel"/>
         <wicket:child />
-        <textarea class="form-control input-sm" rows="2" wicket:id="description" style="width: 50%; margin-bottom: 10px;"></textarea>
+        <textarea class="form-control input-sm" rows="2" placeholder="Comment here..."
+                  wicket:id="description" style="width: 50%; margin-bottom: 10px;"></textarea>
         <div class="main-button-bar">
             <span class="button-group">
                 <a class="btn btn-default" wicket:id="back"/>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAssignmentsList.java
@@ -316,10 +316,12 @@ private List<AssignmentEditorDto> addAssignmentsToUser(){
                 assignmentsList.add(new AssignmentEditorDto(UserDtoStatus.MODIFY, assignment, this));
             }
         }
-        for (AssignmentEditorDto assignmentsToAdd : assignmentsModel.getObject()){
-            if (!assignmentsToUnselect.contains(assignmentsToAdd.getTargetRef().getOid())) {
-                assignmentsToAdd.setStatus(UserDtoStatus.ADD);
-                assignmentsList.add(assignmentsToAdd);
+        if (assignmentsModel != null && assignmentsModel.getObject() != null) {
+            for (AssignmentEditorDto assignmentsToAdd : assignmentsModel.getObject()) {
+                if (!assignmentsToUnselect.contains(assignmentsToAdd.getTargetRef().getOid())) {
+                    assignmentsToAdd.setStatus(UserDtoStatus.ADD);
+                    assignmentsList.add(assignmentsToAdd);
+                }
             }
         }
         return assignmentsList;