summaryrefslogtreecommitdiffstats
path: root/web/react/pages
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-10-19 10:25:51 -0700
committer=Corey Hulen <corey@hulen.com>2015-10-19 10:25:51 -0700
commit468f01dc895000211e62eb8a16feaa84ceb354ed (patch)
tree4868b46316bb79cf5c127f5b0638f3383a7c971c /web/react/pages
parenta8f3f76c592928a0907fbaddd71ab6b8f68d28d6 (diff)
parentea1b3129688dd76c80c7d41eec4f2eb60f9f0639 (diff)
downloadchat-468f01dc895000211e62eb8a16feaa84ceb354ed.tar.gz
chat-468f01dc895000211e62eb8a16feaa84ceb354ed.tar.bz2
chat-468f01dc895000211e62eb8a16feaa84ceb354ed.zip
Merging from master
Diffstat (limited to 'web/react/pages')
-rw-r--r--web/react/pages/admin_console.jsx7
1 files changed, 5 insertions, 2 deletions
diff --git a/web/react/pages/admin_console.jsx b/web/react/pages/admin_console.jsx
index c89cb4edc..ea9ae06f4 100644
--- a/web/react/pages/admin_console.jsx
+++ b/web/react/pages/admin_console.jsx
@@ -5,9 +5,12 @@ var ErrorBar = require('../components/error_bar.jsx');
var SelectTeamModal = require('../components/admin_console/select_team_modal.jsx');
var AdminController = require('../components/admin_console/admin_controller.jsx');
-export function setupAdminConsolePage() {
+export function setupAdminConsolePage(props) {
ReactDOM.render(
- <AdminController />,
+ <AdminController
+ tab={props.ActiveTab}
+ teamId={props.TeamId}
+ />,
document.getElementById('admin_controller')
);