Merge remote-tracking branch 'origin/master'

Evolveum · Nov 5, 2018 · 9b3bc54 · 9b3bc54
2 parents 24626cf + 3c856ba
commit 9b3bc54
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.html
@@ -68,9 +68,9 @@
         </div>
 
         <div class="form-group" wicket:id="linksContainer" style="vertical-align: top; margin-top: -5px; float:left;">
-            <a class="btn btn-sm btn-link" wicket:id="basic" style="display: table-cell; vertical-align: top;"/>
-            <a class="btn btn-sm btn-link" wicket:id="advanced"/>
-            <a class="btn btn-sm btn-link" wicket:id="fullText" style=" margin-top: -20px;"/>
+            <a class="btn btn-sm btn-link" wicket:id="basic" style="display: table-cell; vertical-align: top; padding: 0px;"/>
+            <a class="btn btn-sm btn-link" wicket:id="advanced" style="padding: 0px;"/>
+            <a class="btn btn-sm btn-link" wicket:id="fullText" style="padding: 0px;"/>
         </div>
     </form>
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchPanel.java
@@ -384,7 +384,7 @@ public boolean isVisible() {
 
             @Override
             public String load() {
-                return basicSearchButton.isVisible() ? "margin-top: -20px;" : "display: table-cell; vertical-align: top;";
+                return basicSearchButton.isVisible() ? "" : "display: table-cell; vertical-align: top;";
             }
         }));
 

diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
@@ -50,6 +50,7 @@
 import com.evolveum.midpoint.web.component.util.ObjectWrapperUtil;
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItemAction;
 import com.evolveum.midpoint.web.component.util.SelectableBean;
+import com.evolveum.midpoint.web.page.admin.orgs.AbstractOrgTabPanel;
 import com.evolveum.midpoint.web.page.admin.orgs.OrgTreeAssignablePanel;
 import com.evolveum.midpoint.web.page.admin.orgs.OrgTreePanel;
 import com.evolveum.midpoint.web.page.admin.users.PageOrgTree;
@@ -542,6 +543,10 @@ private void moveConfirmPerformed(SelectableBean<OrgType> orgToMove, SelectableB
 
 		parentPage.showResult(result);
 		target.add(parentPage.getFeedbackPanel());
+		if(parentPage instanceof PageOrgTree && ((PageOrgTree) parentPage).getTabPanel() != null
+				&& ((PageOrgTree) parentPage).getTabPanel().getTabbedPanel() != null) {
+			((PageOrgTree) parentPage).getTabPanel().getTabbedPanel().setSelectedTab(0);
+		}
 		setResponsePage(PageOrgTree.class);
 
 	}