diff --git a/routers/org/setting.go b/routers/org/setting.go index 786b8269e..348d8cc8d 100644 --- a/routers/org/setting.go +++ b/routers/org/setting.go @@ -19,8 +19,7 @@ import ( const ( // tplSettingsOptions template path for render settings - tplSettingsOptions base.TplName = "org/settings/options" - tplSettingsCourseOptions base.TplName = "org/settings/course_options" + tplSettingsOptions base.TplName = "org/settings/options" // tplSettingsDelete template path for render delete repository tplSettingsDelete base.TplName = "org/settings/delete" // tplSettingsHooks template path for render hook settings @@ -35,9 +34,7 @@ func Settings(ctx *context.Context) { ctx.Data["PageIsSettingsOptions"] = true ctx.Data["CurrentVisibility"] = ctx.Org.Organization.Visibility ctx.Data["RepoAdminChangeTeamAccess"] = ctx.Org.Organization.RepoAdminChangeTeamAccess - - ctx.HTML(200, getTemplate(ctx.Org.Organization, tplSettingsCourseOptions, tplSettingsOptions)) - + ctx.HTML(200, tplSettingsOptions) } // SettingsPost response for settings change submited @@ -45,10 +42,9 @@ func SettingsPost(ctx *context.Context, form auth.UpdateOrgSettingForm) { ctx.Data["Title"] = ctx.Tr("org.settings") ctx.Data["PageIsSettingsOptions"] = true ctx.Data["CurrentVisibility"] = ctx.Org.Organization.Visibility - template := getTemplate(ctx.Org.Organization, tplSettingsCourseOptions, tplSettingsOptions) if ctx.HasError() { - ctx.HTML(200, template) + ctx.HTML(200, tplSettingsOptions) return } @@ -62,12 +58,12 @@ func SettingsPost(ctx *context.Context, form auth.UpdateOrgSettingForm) { return } else if isExist { ctx.Data["OrgName"] = true - ctx.RenderWithErr(ctx.Tr("form.username_been_taken"), template, &form) + ctx.RenderWithErr(ctx.Tr("form.username_been_taken"), tplSettingsOptions, &form) return } else if err = models.ChangeUserName(org, form.Name); err != nil { if err == models.ErrUserNameIllegal { ctx.Data["OrgName"] = true - ctx.RenderWithErr(ctx.Tr("form.illegal_username"), template, &form) + ctx.RenderWithErr(ctx.Tr("form.illegal_username"), tplSettingsOptions, &form) } else { ctx.ServerError("ChangeUserName", err) } diff --git a/routers/org/teams.go b/routers/org/teams.go index ab3a6a21c..17c424578 100644 --- a/routers/org/teams.go +++ b/routers/org/teams.go @@ -27,15 +27,11 @@ const ( tplTeams base.TplName = "org/team/teams" tplCourseTeams base.TplName = "org/team/courseTeams" // tplTeamNew template path for create new team page - tplTeamNew base.TplName = "org/team/new" - tplTeamCourseNew base.TplName = "org/team/course_new" - + tplTeamNew base.TplName = "org/team/new" // tplTeamMembers template path for showing team members page - tplTeamMembers base.TplName = "org/team/members" - tplCourseTeamMembers base.TplName = "org/team/course_members" + tplTeamMembers base.TplName = "org/team/members" // tplTeamRepositories template path for showing team repositories page - tplTeamRepositories base.TplName = "org/team/repositories" - tplCousreTeamRepositories base.TplName = "org/team/course_repositories" + tplTeamRepositories base.TplName = "org/team/repositories" ) // Teams render teams list page @@ -51,17 +47,12 @@ func Teams(ctx *context.Context) { } } ctx.Data["Teams"] = org.Teams - - ctx.HTML(200, getTemplate(org, tplCourseTeams, tplTeams)) - -} - -func getTemplate(org *models.User, courseTemplate base.TplName, normalTemplate base.TplName) base.TplName { if setting.Course.OrgName == org.Name { - return courseTemplate + ctx.HTML(200, tplCourseTeams) } else { - return normalTemplate + ctx.HTML(200, tplTeams) } + } // TeamsAction response for join, leave, remove, add operations to team @@ -200,7 +191,7 @@ func NewTeam(ctx *context.Context) { ctx.Data["PageIsOrgTeamsNew"] = true ctx.Data["Team"] = &models.Team{} ctx.Data["Units"] = models.Units - ctx.HTML(200, getTemplate(ctx.Org.Organization, tplTeamCourseNew, tplTeamNew)) + ctx.HTML(200, tplTeamNew) } // NewTeamPost response for create new team @@ -210,7 +201,6 @@ func NewTeamPost(ctx *context.Context, form auth.CreateTeamForm) { ctx.Data["PageIsOrgTeamsNew"] = true ctx.Data["Units"] = models.Units var includesAllRepositories = (form.RepoAccess == "all") - template := getTemplate(ctx.Org.Organization, tplTeamCourseNew, tplTeamNew) t := &models.Team{ OrgID: ctx.Org.Organization.ID, @@ -235,12 +225,12 @@ func NewTeamPost(ctx *context.Context, form auth.CreateTeamForm) { ctx.Data["Team"] = t if ctx.HasError() { - ctx.HTML(200, template) + ctx.HTML(200, tplTeamNew) return } if t.Authorize < models.AccessModeAdmin && len(form.Units) == 0 { - ctx.RenderWithErr(ctx.Tr("form.team_no_units_error"), template, &form) + ctx.RenderWithErr(ctx.Tr("form.team_no_units_error"), tplTeamNew, &form) return } @@ -248,7 +238,7 @@ func NewTeamPost(ctx *context.Context, form auth.CreateTeamForm) { ctx.Data["Err_TeamName"] = true switch { case models.IsErrTeamAlreadyExist(err): - ctx.RenderWithErr(ctx.Tr("form.team_name_been_taken"), template, &form) + ctx.RenderWithErr(ctx.Tr("form.team_name_been_taken"), tplTeamNew, &form) default: ctx.ServerError("NewTeam", err) } @@ -267,7 +257,7 @@ func TeamMembers(ctx *context.Context) { ctx.ServerError("GetMembers", err) return } - ctx.HTML(200, getTemplate(ctx.Org.Organization, tplCourseTeamMembers, tplTeamMembers)) + ctx.HTML(200, tplTeamMembers) } // TeamRepositories show the repositories of team @@ -279,7 +269,7 @@ func TeamRepositories(ctx *context.Context) { ctx.ServerError("GetRepositories", err) return } - ctx.HTML(200, getTemplate(ctx.Org.Organization, tplCousreTeamRepositories, tplTeamRepositories)) + ctx.HTML(200, tplTeamRepositories) } // EditTeam render team edit page @@ -289,7 +279,7 @@ func EditTeam(ctx *context.Context) { ctx.Data["team_name"] = ctx.Org.Team.Name ctx.Data["desc"] = ctx.Org.Team.Description ctx.Data["Units"] = models.Units - ctx.HTML(200, getTemplate(ctx.Org.Organization, tplTeamCourseNew, tplTeamNew)) + ctx.HTML(200, tplTeamNew) } // EditTeamPost response for modify team information @@ -299,7 +289,6 @@ func EditTeamPost(ctx *context.Context, form auth.CreateTeamForm) { ctx.Data["PageIsOrgTeams"] = true ctx.Data["Team"] = t ctx.Data["Units"] = models.Units - template := getTemplate(ctx.Org.Organization, tplTeamCourseNew, tplTeamNew) isAuthChanged := false isIncludeAllChanged := false @@ -338,12 +327,12 @@ func EditTeamPost(ctx *context.Context, form auth.CreateTeamForm) { t.CanCreateOrgRepo = form.CanCreateOrgRepo if ctx.HasError() { - ctx.HTML(200, template) + ctx.HTML(200, tplTeamNew) return } if t.Authorize < models.AccessModeAdmin && len(form.Units) == 0 { - ctx.RenderWithErr(ctx.Tr("form.team_no_units_error"), template, &form) + ctx.RenderWithErr(ctx.Tr("form.team_no_units_error"), tplTeamNew, &form) return } @@ -351,7 +340,7 @@ func EditTeamPost(ctx *context.Context, form auth.CreateTeamForm) { ctx.Data["Err_TeamName"] = true switch { case models.IsErrTeamAlreadyExist(err): - ctx.RenderWithErr(ctx.Tr("form.team_name_been_taken"), template, &form) + ctx.RenderWithErr(ctx.Tr("form.team_name_been_taken"), tplTeamNew, &form) default: ctx.ServerError("UpdateTeam", err) }