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

Evolveum · Nov 9, 2015 · f391413 · f391413
2 parents ff8a262 + 7777cc0
commit f391413
Show file tree

Hide file tree

Showing 5 changed files with 244 additions and 147 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.java
@@ -218,6 +218,11 @@ public WebMarkupContainer getPanel(String panelId) {
 					return new RoleMemberPanel<UserType>(panelId, getFocusWrapper().getObject().getOid(),
 							PageRole.this);
 				}
+
+				@Override
+				public boolean isVisible() {
+					return getFocusWrapper().getStatus() != ContainerStatus.ADDING;
+				}
 			});
 
 	}

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/RoleMemberPanel.html
@@ -36,6 +36,8 @@
             <select class="form-control input-sm" wicket:id="project"/>
         </div>
 
+        <div wicket:id="basicSearch"/>
+
 
 <!--             <div wicket:id="basicSearch" /> -->
 <!--         </row> -->