From 9fa3c996d522589139f56964087022bd0942e5e4 Mon Sep 17 00:00:00 2001
From: Stas Vovk <stas@vovk.me>
Date: Sun, 18 Oct 2015 18:55:04 +0300
Subject: change url when a user navigates between tabs [#962]

---
 web/react/components/admin_console/admin_sidebar.jsx | 1 +
 1 file changed, 1 insertion(+)

(limited to 'web/react/components/admin_console/admin_sidebar.jsx')

diff --git a/web/react/components/admin_console/admin_sidebar.jsx b/web/react/components/admin_console/admin_sidebar.jsx
index 4c2a473b6..c7faa83fe 100644
--- a/web/react/components/admin_console/admin_sidebar.jsx
+++ b/web/react/components/admin_console/admin_sidebar.jsx
@@ -24,6 +24,7 @@ export default class AdminSidebar extends React.Component {
     handleClick(name, teamId, e) {
         e.preventDefault();
         this.props.selectTab(name, teamId);
+        history.pushState({name: name, teamId: teamId}, null, `/admin_console/${name}/${teamId || ''}`);
     }
 
     isSelected(name, teamId) {
-- 
cgit v1.2.3-1-g7c22


From cbbfe0112bf0d795d3c51382d6fddf5b20d19736 Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Mon, 19 Oct 2015 20:10:33 +0500
Subject: Updating scroll on admin console

---
 web/react/components/admin_console/admin_sidebar.jsx | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'web/react/components/admin_console/admin_sidebar.jsx')

diff --git a/web/react/components/admin_console/admin_sidebar.jsx b/web/react/components/admin_console/admin_sidebar.jsx
index 4c2a473b6..24913ab87 100644
--- a/web/react/components/admin_console/admin_sidebar.jsx
+++ b/web/react/components/admin_console/admin_sidebar.jsx
@@ -53,6 +53,9 @@ export default class AdminSidebar extends React.Component {
     }
 
     componentDidMount() {
+        if ($(window).width() > 768) {
+            $('.nav-pills__container').perfectScrollbar();
+        }
     }
 
     showTeamSelect(e) {
-- 
cgit v1.2.3-1-g7c22

