Merge pull request #1211 from mattermost/PLT-340

PLT-340 allow team directory and open invites

3 files changed, 14 insertions, 3 deletions

diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx
index 03e049db0..7a04c5979 100644
--- a/web/react/pages/channel.jsx
+++ b/web/react/pages/channel.jsx
@@ -90,7 +90,7 @@ function setupChannelPage(props) {
     );
 
     ReactDOM.render(
-        <TeamSettingsModal teamDisplayName={props.TeamDisplayName} />,
+        <TeamSettingsModal />,
         document.getElementById('team_settings_modal')
     );
 
diff --git a/web/react/pages/login.jsx b/web/react/pages/login.jsx
index 430de980c..9865e6fd2 100644
--- a/web/react/pages/login.jsx
+++ b/web/react/pages/login.jsx
@@ -8,6 +8,7 @@ function setupLoginPage(props) {
         <Login
             teamDisplayName={props.TeamDisplayName}
             teamName={props.TeamName}
+            inviteId={props.InviteId}
         />,
         document.getElementById('login')
     );
diff --git a/web/react/pages/signup_team.jsx b/web/react/pages/signup_team.jsx
index dc8394a77..caa93b5bf 100644
--- a/web/react/pages/signup_team.jsx
+++ b/web/react/pages/signup_team.jsx
@@ -3,9 +3,19 @@
 
 var SignupTeam = require('../components/signup_team.jsx');
 
-function setupSignupTeamPage() {
+function setupSignupTeamPage(props) {
+    var teams = [];
+
+    for (var prop in props) {
+        if (props.hasOwnProperty(prop)) {
+            if (prop !== 'Title') {
+                teams.push({name: prop, display_name: props[prop]});
+            }
+        }
+    }
+
     ReactDOM.render(
-        <SignupTeam />,
+        <SignupTeam teams={teams} />,
         document.getElementById('signup-team')
     );
 }