org settings -> webhook/labels/deletion should also active the menu (#17809)

Changes

3 changed files (+7/-1)

• routers/web/org/org_labels.go
  • @@ -34,6 +34,7 @@ func NewLabel(ctx *context.Context) {
    form := web.GetForm(ctx).(*forms.CreateLabelForm) ctx.Data["Title"] = ctx.Tr("repo.labels") ctx.Data["PageIsLabels"] = true + ctx.Data["PageIsOrgSettings"] = true if ctx.HasError() { ctx.Flash.Error(ctx.Data["ErrorMsg"].(string))
• routers/web/org/setting.go
  • @@ -39,6 +39,7 @@ const (
    // Settings render the main settings page func Settings(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("org.settings") + ctx.Data["PageIsOrgSettings"] = true ctx.Data["PageIsSettingsOptions"] = true ctx.Data["CurrentVisibility"] = ctx.Org.Organization.Visibility ctx.Data["RepoAdminChangeTeamAccess"] = ctx.Org.Organization.RepoAdminChangeTeamAccess
  • @@ -49,6 +50,7 @@ func Settings(ctx *context.Context) {
    func SettingsPost(ctx *context.Context) { form := web.GetForm(ctx).(*forms.UpdateOrgSettingForm) ctx.Data["Title"] = ctx.Tr("org.settings") + ctx.Data["PageIsOrgSettings"] = true ctx.Data["PageIsSettingsOptions"] = true ctx.Data["CurrentVisibility"] = ctx.Org.Organization.Visibility
  • @@ -159,6 +161,7 @@ func SettingsDeleteAvatar(ctx *context.Context) {
    // SettingsDelete response for deleting an organization func SettingsDelete(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("org.settings") + ctx.Data["PageIsOrgSettings"] = true ctx.Data["PageIsSettingsDelete"] = true if ctx.Req.Method == "POST" {
  • @@ -188,6 +191,7 @@ func SettingsDelete(ctx *context.Context) {
    // Webhooks render webhook list page func Webhooks(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("org.settings") + ctx.Data["PageIsOrgSettings"] = true ctx.Data["PageIsSettingsHooks"] = true ctx.Data["BaseLink"] = ctx.Org.OrgLink + "/settings/hooks" ctx.Data["BaseLinkNew"] = ctx.Org.OrgLink + "/settings/hooks"
  • @@ -219,6 +223,7 @@ func DeleteWebhook(ctx *context.Context) {
    // Labels render organization labels page func Labels(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("repo.labels") + ctx.Data["PageIsOrgSettings"] = true ctx.Data["PageIsOrgSettingsLabels"] = true ctx.Data["RequireTribute"] = true ctx.Data["LabelTemplates"] = models.LabelTemplates
• templates/org/menu.tmpl
  • @@ -20,7 +20,7 @@
    {{if .IsOrganizationOwner}} <div class="right menu"> - <a class="{{if .PageIsSettingsOptions}}active{{end}} item" href="{{.OrgLink}}/settings"> + <a class="{{if .PageIsOrgSettings}}active{{end}} item" href="{{.OrgLink}}/settings"> {{svg "octicon-tools"}} {{.i18n.Tr "repo.settings"}} </a> </div>