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

Evolveum · Oct 15, 2015 · ff4ca2a · ff4ca2a
2 parents b6c252e + d082258
commit ff4ca2a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.java
@@ -291,6 +291,7 @@ protected WebMarkupContainer newLink(final String linkId, final int index) {
             @Override
             public void onClick() {
                 setSelectedTab(index);
+                onTabChange(index);
             }
         };
     }
@@ -425,4 +426,11 @@ public boolean isVisible(int index) {
             }
         }
     }
+
+    /**
+     * Method called after tab was changed - user clicked on link in tab header.
+     *
+     * @param index Index of new tab.
+     */
+    protected void onTabChange(int index) {}
 }
diff --git a/...main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java b/...main/java/com/evolveum/midpoint/web/page/admin/configuration/PageSystemConfiguration.java
@@ -195,7 +195,14 @@ public WebMarkupContainer getPanel(String panelId) {
 			}
 		});
 
-		TabbedPanel tabPanel = new TabbedPanel(ID_TAB_PANEL, tabs);
+		TabbedPanel tabPanel = new TabbedPanel(ID_TAB_PANEL, tabs) {
+
+			@Override
+			protected void onTabChange(int index) {
+				PageParameters params = getPageParameters();
+				params.set(SELECTED_TAB_INDEX, index);
+			}
+		};
 		tabPanel.setOutputMarkupId(true);
 		mainForm.add(tabPanel);