Adding team settings to admin console

1 files changed, 1 insertions, 24 deletions

diff --git a/api/team.go b/api/team.go
index 4531c83b9..8802208f7 100644
--- a/api/team.go
+++ b/api/team.go
@@ -60,7 +60,6 @@ func signupTeam(c *Context, w http.ResponseWriter, r *http.Request) {
 	subjectPage.Props["SiteURL"] = c.GetSiteURL()
 	bodyPage := NewServerTemplatePage("signup_team_body")
 	bodyPage.Props["SiteURL"] = c.GetSiteURL()
-	bodyPage.Props["TourUrl"] = utils.Cfg.TeamSettings.TourLink
 
 	props := make(map[string]string)
 	props["email"] = email
@@ -124,8 +123,6 @@ func createTeamFromSSO(c *Context, w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
-	team.AllowValet = utils.Cfg.TeamSettings.AllowValetDefault
-
 	if result := <-Srv.Store.Team().Save(team); result.Err != nil {
 		c.Err = result.Err
 		return
@@ -207,8 +204,6 @@ func createTeamFromSignup(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	teamSignup.Team.AllowValet = utils.Cfg.TeamSettings.AllowValetDefault
-
 	if result := <-Srv.Store.Team().Save(&teamSignup.Team); result.Err != nil {
 		c.Err = result.Err
 		return
@@ -228,13 +223,6 @@ func createTeamFromSignup(c *Context, w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		if teamSignup.Team.AllowValet {
-			CreateValet(c, rteam)
-			if c.Err != nil {
-				return
-			}
-		}
-
 		InviteMembers(c, rteam, ruser, teamSignup.Invites)
 
 		teamSignup.Team = *rteam
@@ -286,13 +274,6 @@ func CreateTeam(c *Context, team *model.Team) *model.Team {
 			return nil
 		}
 
-		if rteam.AllowValet {
-			CreateValet(c, rteam)
-			if c.Err != nil {
-				return nil
-			}
-		}
-
 		return rteam
 	}
 }
@@ -301,7 +282,7 @@ func isTreamCreationAllowed(c *Context, email string) bool {
 
 	email = strings.ToLower(email)
 
-	if utils.Cfg.TeamSettings.DisableTeamCreation {
+	if !utils.Cfg.TeamSettings.EnableTeamCreation {
 		c.Err = model.NewAppError("isTreamCreationAllowed", "Team creation has been disabled. Please ask your systems administrator for details.", "")
 		return false
 	}
@@ -567,8 +548,6 @@ func updateValetFeature(c *Context, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	allowValet := allowValetStr == "true"
-
 	teamId := props["team_id"]
 	if len(teamId) > 0 && len(teamId) != 26 {
 		c.SetInvalidParam("updateValetFeature", "team_id")
@@ -597,8 +576,6 @@ func updateValetFeature(c *Context, w http.ResponseWriter, r *http.Request) {
 		team = tResult.Data.(*model.Team)
 	}
 
-	team.AllowValet = allowValet
-
 	if result := <-Srv.Store.Team().Update(team); result.Err != nil {
 		c.Err = result.Err
 		return