From 719328364772f0f2b890ce104dc90063fa478007 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 24 Jan 2017 19:27:32 +0800 Subject: [PATCH 1/7] Add units concept for modulable functions of a repository --- cmd/web.go | 8 +- models/migrations/migrations.go | 2 + models/migrations/v16.go | 117 +++++++++++++++++++++++ models/models.go | 1 + models/repo.go | 138 +++++++++++++++++++++++---- models/repo_unit.go | 35 +++++++ models/unit.go | 136 ++++++++++++++++++++++++++ modules/context/repo.go | 15 +++ routers/api/v1/api.go | 2 +- routers/repo/issue.go | 8 +- routers/repo/setting.go | 74 +++++++++++--- routers/repo/wiki.go | 8 +- routers/user/home.go | 2 +- templates/repo/header.tmpl | 24 ++++- templates/repo/settings/options.tmpl | 38 ++++---- 15 files changed, 542 insertions(+), 66 deletions(-) create mode 100644 models/migrations/v16.go create mode 100644 models/repo_unit.go create mode 100644 models/unit.go diff --git a/cmd/web.go b/cmd/web.go index 9942f19a50c7c..bcbc040a8be1c 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -435,7 +435,7 @@ func runWeb(ctx *cli.Context) error { }, func(ctx *context.Context) { ctx.Data["PageIsSettings"] = true - }) + }, context.UnitTypes()) }, reqSignIn, context.RepoAssignment(), reqRepoAdmin, context.RepoRef()) m.Get("/:username/:reponame/action/:action", reqSignIn, context.RepoAssignment(), repo.Action) @@ -529,7 +529,7 @@ func runWeb(ctx *cli.Context) error { return } }) - }, reqSignIn, context.RepoAssignment(), repo.MustBeNotBare) + }, reqSignIn, context.RepoAssignment(), repo.MustBeNotBare, context.UnitTypes()) m.Group("/:username/:reponame", func() { m.Group("", func() { @@ -575,7 +575,7 @@ func runWeb(ctx *cli.Context) error { m.Get("/commit/:sha([a-f0-9]{7,40})\\.:ext(patch|diff)", repo.RawDiff) m.Get("/compare/:before([a-z0-9]{40})\\.\\.\\.:after([a-z0-9]{40})", repo.SetEditorconfigIfExists, repo.SetDiffViewStyle, repo.CompareDiff) - }, ignSignIn, context.RepoAssignment(), repo.MustBeNotBare) + }, ignSignIn, context.RepoAssignment(), repo.MustBeNotBare, context.UnitTypes()) m.Group("/:username/:reponame", func() { m.Get("/stars", repo.Stars) m.Get("/watchers", repo.Watchers) @@ -585,7 +585,7 @@ func runWeb(ctx *cli.Context) error { m.Group("/:reponame", func() { m.Get("", repo.SetEditorconfigIfExists, repo.Home) m.Get("\\.git$", repo.SetEditorconfigIfExists, repo.Home) - }, ignSignIn, context.RepoAssignment(true), context.RepoRef()) + }, ignSignIn, context.RepoAssignment(true), context.RepoRef(), context.UnitTypes()) m.Group("/:reponame", func() { m.Group("/info/lfs", func() { diff --git a/models/migrations/migrations.go b/models/migrations/migrations.go index 69408a071d2b6..19c10bc028eb4 100644 --- a/models/migrations/migrations.go +++ b/models/migrations/migrations.go @@ -80,6 +80,8 @@ var migrations = []Migration{ NewMigration("create user column diff view style", createUserColumnDiffViewStyle), // v15 NewMigration("create user column allow create organization", createAllowCreateOrganizationColumn), + // V16 + NewMigration("create repo unit table and add units for all repos", addUnitsToTables), } // Migrate database to current version diff --git a/models/migrations/v16.go b/models/migrations/v16.go new file mode 100644 index 0000000000000..c1bdf8bac3075 --- /dev/null +++ b/models/migrations/v16.go @@ -0,0 +1,117 @@ +package migrations + +import ( + "fmt" + "time" + + "code.gitea.io/gitea/modules/markdown" + + "github.com/go-xorm/xorm" +) + +// RepoUnit describes all units of a repository +type RepoUnit struct { + ID int64 + RepoID int64 `xorm:"INDEX(s)"` + Type int `xorm:"INDEX(s)"` + Index int + Config map[string]string `xorm:"JSON"` + CreatedUnix int64 `xorm:"INDEX CREATED"` + Created time.Time `xorm:"-"` +} + +// Enumerate all the unit types +const ( + UnitTypeCode = iota + 1 // 1 code + UnitTypeIssues // 2 issues + UnitTypePRs // 3 PRs + UnitTypeCommits // 4 Commits + UnitTypeReleases // 5 Releases + UnitTypeWiki // 6 Wiki + UnitTypeSettings // 7 Settings + UnitTypeExternalWiki // 8 ExternalWiki + UnitTypeExternalTracker // 9 ExternalTracker +) + +// Repo +type Repo struct { + ID int64 + EnableWiki, EnableExternalWiki, EnableIssues, EnableExternalTracker, EnablePulls bool + ExternalWikiURL, ExternalTrackerURL, ExternalTrackerFormat, ExternalTrackerStyle string +} + +func addUnitsToTables(x *xorm.Engine) error { + var repos []Repo + err := x.Table("repository").Find(&repos) + if err != nil { + return fmt.Errorf("Query repositories: %v", err) + } + + sess := x.NewSession() + defer sess.Close() + + if err := sess.Begin(); err != nil { + return err + } + + var repoUnit RepoUnit + if err := sess.CreateTable(&repoUnit); err != nil { + return fmt.Errorf("CreateTable RepoUnit: %v", err) + } + + if err := sess.CreateUniques(&repoUnit); err != nil { + return fmt.Errorf("CreateUniques RepoUnit: %v", err) + } + + if err := sess.CreateIndexes(&repoUnit); err != nil { + return fmt.Errorf("CreateIndexes RepoUnit: %v", err) + } + + for _, repo := range repos { + for i := 1; i <= 9; i++ { + if (i == UnitTypeWiki || i == UnitTypeExternalWiki) && !repo.EnableWiki { + continue + } + if i == UnitTypeExternalWiki && !repo.EnableExternalWiki { + continue + } + if i == UnitTypePRs && !repo.EnablePulls { + continue + } + if (i == UnitTypeIssues || i == UnitTypeExternalTracker) && !repo.EnableIssues { + continue + } + if i == UnitTypeExternalTracker && !repo.EnableExternalTracker { + continue + } + + var config = make(map[string]string) + switch i { + case UnitTypeExternalTracker: + config["ExternalTrackerURL"] = repo.ExternalTrackerURL + config["ExternalTrackerFormat"] = repo.ExternalTrackerFormat + if len(repo.ExternalTrackerStyle) == 0 { + repo.ExternalTrackerStyle = markdown.IssueNameStyleNumeric + } + config["ExternalTrackerStyle"] = repo.ExternalTrackerStyle + case UnitTypeExternalWiki: + config["ExternalWikiURL"] = repo.ExternalWikiURL + } + + if _, err = sess.Insert(&RepoUnit{ + RepoID: repo.ID, + Type: i, + Index: i, + Config: config, + }); err != nil { + return fmt.Errorf("Insert repo unit: %v", err) + } + } + } + + if err := sess.Commit(); err != nil { + return err + } + + return nil +} diff --git a/models/models.go b/models/models.go index d9716e79bd229..c495715795b18 100644 --- a/models/models.go +++ b/models/models.go @@ -106,6 +106,7 @@ func init() { new(IssueUser), new(LFSMetaObject), new(TwoFactor), + new(RepoUnit), ) gonicNames := []string{"SSL", "UID"} diff --git a/models/repo.go b/models/repo.go index c2480d9ddbf58..b8ed5ff9b980d 100644 --- a/models/repo.go +++ b/models/repo.go @@ -201,7 +201,7 @@ type Repository struct { *Mirror `xorm:"-"` // Advanced settings - EnableWiki bool `xorm:"NOT NULL DEFAULT true"` + /*EnableWiki bool `xorm:"NOT NULL DEFAULT true"` EnableExternalWiki bool ExternalWikiURL string EnableIssues bool `xorm:"NOT NULL DEFAULT true"` @@ -209,8 +209,10 @@ type Repository struct { ExternalTrackerURL string ExternalTrackerFormat string ExternalTrackerStyle string - ExternalMetas map[string]string `xorm:"-"` - EnablePulls bool `xorm:"NOT NULL DEFAULT true"` + EnablePulls bool `xorm:"NOT NULL DEFAULT true"`*/ + + ExternalMetas map[string]string `xorm:"-"` + Units []*RepoUnit `xorm:"-"` IsFork bool `xorm:"INDEX NOT NULL DEFAULT false"` ForkID int64 `xorm:"INDEX"` @@ -247,10 +249,10 @@ func (repo *Repository) AfterSet(colName string, _ xorm.Cell) { repo.NumOpenPulls = repo.NumPulls - repo.NumClosedPulls case "num_closed_milestones": repo.NumOpenMilestones = repo.NumMilestones - repo.NumClosedMilestones - case "external_tracker_style": - if len(repo.ExternalTrackerStyle) == 0 { - repo.ExternalTrackerStyle = markdown.IssueNameStyleNumeric - } + /*case "external_tracker_style": + if len(repo.ExternalTrackerStyle) == 0 { + repo.ExternalTrackerStyle = markdown.IssueNameStyleNumeric + }*/ case "created_unix": repo.Created = time.Unix(repo.CreatedUnix, 0).Local() case "updated_unix": @@ -307,6 +309,60 @@ func (repo *Repository) APIFormat(mode AccessMode) *api.Repository { } } +func (repo *Repository) getUnits(e Engine) (err error) { + if repo.Units != nil { + return nil + } + + repo.Units, err = getUnitsByRepoID(e, repo.ID) + return err +} + +func getUnitsByRepoID(e Engine, repoID int64) (units []*RepoUnit, err error) { + return units, e.Where("repo_id = ?", repoID).Find(&units) +} + +// EnableUnit if this repository enabled some unit +func (repo *Repository) EnableUnit(tp UnitType) bool { + repo.getUnits(x) + for _, unit := range repo.Units { + if unit.Type == tp { + return true + } + } + return false +} + +var ( + // ErrUnitNotExist organization does not exist + ErrUnitNotExist = errors.New("Unit does not exist") +) + +// MustGetUnit +func (repo *Repository) MustGetUnit(tp UnitType) *RepoUnit { + ru, err := repo.GetUnit(tp) + if err == nil { + return ru + } + return &RepoUnit{ + Type: tp, + Config: make(map[string]string), + } +} + +// GetUnit +func (repo *Repository) GetUnit(tp UnitType) (*RepoUnit, error) { + if err := repo.getUnits(x); err != nil { + return nil, err + } + for _, unit := range repo.Units { + if unit.Type == tp { + return unit, nil + } + } + return nil, ErrUnitNotExist +} + func (repo *Repository) getOwner(e Engine) (err error) { if repo.Owner != nil { return nil @@ -334,15 +390,18 @@ func (repo *Repository) mustOwner(e Engine) *User { // ComposeMetas composes a map of metas for rendering external issue tracker URL. func (repo *Repository) ComposeMetas() map[string]string { - if !repo.EnableExternalTracker { + externalTracker, err := repo.GetUnit(UnitTypeExternalTracker) + if err != nil { return nil - } else if repo.ExternalMetas == nil { + } + + if repo.ExternalMetas == nil { repo.ExternalMetas = map[string]string{ - "format": repo.ExternalTrackerFormat, + "format": externalTracker.Config["ExternalTrackerFormat"], "user": repo.MustOwner().Name, "repo": repo.Name, } - switch repo.ExternalTrackerStyle { + switch externalTracker.Config["ExternalTrackerStyle"] { case markdown.IssueNameStyleAlphanumeric: repo.ExternalMetas["style"] = markdown.IssueNameStyleAlphanumeric default: @@ -359,6 +418,8 @@ func (repo *Repository) DeleteWiki() { for _, wikiPath := range wikiPaths { RemoveAllWithNotice("Delete repository wiki", wikiPath) } + + x.Where("repo_id = ?", repo.ID).And("type = ?", UnitTypeWiki).Delete(new(RepoUnit)) } func (repo *Repository) getAssignees(e Engine) (_ []*User, err error) { @@ -482,7 +543,7 @@ func (repo *Repository) CanEnablePulls() bool { // AllowsPulls returns true if repository meets the requirements of accepting pulls and has them enabled. func (repo *Repository) AllowsPulls() bool { - return repo.CanEnablePulls() && repo.EnablePulls + return repo.CanEnablePulls() && repo.EnableUnit(UnitTypePullRequests) } // CanEnableEditor returns true if repository meets the requirements of web editor. @@ -997,6 +1058,20 @@ func createRepository(e *xorm.Session, u *User, repo *Repository) (err error) { return err } + // insert units for repo + var units = make([]RepoUnit, 0, len(defaultRepoUnits)) + for i, tp := range defaultRepoUnits { + units = append(units, RepoUnit{ + RepoID: repo.ID, + Type: tp, + Index: i, + }) + } + + if _, err = e.Insert(&units); err != nil { + return err + } + u.NumRepos++ // Remember visibility preference. u.LastRepoVisibility = repo.IsPrivate @@ -1035,15 +1110,15 @@ func CreateRepository(u *User, opts CreateRepoOptions) (_ *Repository, err error } repo := &Repository{ - OwnerID: u.ID, - Owner: u, - Name: opts.Name, - LowerName: strings.ToLower(opts.Name), - Description: opts.Description, - IsPrivate: opts.IsPrivate, - EnableWiki: true, + OwnerID: u.ID, + Owner: u, + Name: opts.Name, + LowerName: strings.ToLower(opts.Name), + Description: opts.Description, + IsPrivate: opts.IsPrivate, + /*EnableWiki: true, EnableIssues: true, - EnablePulls: true, + EnablePulls: true,*/ } sess := x.NewSession() @@ -1380,6 +1455,25 @@ func UpdateRepository(repo *Repository, visibilityChanged bool) (err error) { return sess.Commit() } +// UpdateRepositoryUnits +func UpdateRepositoryUnits(repo *Repository, units []RepoUnit) (err error) { + sess := x.NewSession() + defer sess.Close() + if err = sess.Begin(); err != nil { + return err + } + + if _, err = sess.Where("repo_id = ?", repo.ID).Delete(new(RepoUnit)); err != nil { + return err + } + + if _, err = sess.Insert(units); err != nil { + return err + } + + return sess.Commit() +} + // DeleteRepository deletes a repository for a user or organization. func DeleteRepository(uid, repoID int64) error { repo := &Repository{ID: repoID, OwnerID: uid} @@ -1465,6 +1559,10 @@ func DeleteRepository(uid, repoID int64) error { return err } + if _, err = sess.Where("repo_id = ?", repoID).Delete(new(RepoUnit)); err != nil { + return err + } + if repo.IsFork { if _, err = sess.Exec("UPDATE `repository` SET num_forks=num_forks-1 WHERE id=?", repo.ForkID); err != nil { return fmt.Errorf("decrease fork count: %v", err) diff --git a/models/repo_unit.go b/models/repo_unit.go new file mode 100644 index 0000000000000..9f0f51b9ff3ba --- /dev/null +++ b/models/repo_unit.go @@ -0,0 +1,35 @@ +// Copyright 2017 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package models + +import ( + "time" + + "github.com/go-xorm/xorm" +) + +// RepoUnit describes all units of a repository +type RepoUnit struct { + ID int64 + RepoID int64 `xorm:"INDEX(s)"` + Type UnitType `xorm:"INDEX(s)"` + Index int + Config map[string]string `xorm:"JSON"` + CreatedUnix int64 `xorm:"INDEX CREATED"` + Created time.Time `xorm:"-"` +} + +// AfterSet is invoked from XORM after setting the value of a field of this object. +func (r *RepoUnit) AfterSet(colName string, _ xorm.Cell) { + switch colName { + case "created_unix": + r.Created = time.Unix(r.CreatedUnix, 0).Local() + } +} + +// Unit returns Unit +func (r *RepoUnit) Unit() Unit { + return Units[r.Type] +} diff --git a/models/unit.go b/models/unit.go new file mode 100644 index 0000000000000..bf85e7af1e747 --- /dev/null +++ b/models/unit.go @@ -0,0 +1,136 @@ +// Copyright 2017 The Gitea Authors. All rights reserved. +// Use of this source code is governed by a MIT-style +// license that can be found in the LICENSE file. + +package models + +// UnitType is Unit's Type +type UnitType int + +// Enumerate all the unit types +const ( + UnitTypeCode UnitType = iota + 1 // 1 code + UnitTypeIssues // 2 issues + UnitTypePullRequests // 3 PRs + UnitTypeCommits // 4 Commits + UnitTypeReleases // 5 Releases + UnitTypeWiki // 6 Wiki + UnitTypeSettings // 7 Settings + UnitTypeExternalWiki // 8 ExternalWiki + UnitTypeExternalTracker // 9 ExternalTracker +) + +// Unit is a tab page of one repository +type Unit struct { + Type UnitType + NameKey string + URI string + DescKey string + Idx int +} + +var ( + UnitCode = Unit{ + UnitTypeCode, + "repo.code", + "/", + "repo.code_desc", + 0, + } + + UnitIssues = Unit{ + UnitTypeIssues, + "repo.issues", + "/issues", + "repo.issues_desc", + 1, + } + + UnitExternalTracker = Unit{ + UnitTypeExternalTracker, + "repo.issues", + "/issues", + "repo.issues_desc", + 1, + } + + UnitPullRequests = Unit{ + UnitTypePullRequests, + "repo.pulls", + "/pulls", + "repo.pulls_desc", + 2, + } + + UnitCommits = Unit{ + UnitTypeCommits, + "repo.commits", + "/commits/master", + "repo.commits_desc", + 3, + } + + UnitReleases = Unit{ + UnitTypeReleases, + "repo.releases", + "/releases", + "repo.releases_desc", + 4, + } + + UnitWiki = Unit{ + UnitTypeWiki, + "repo.wiki", + "/wiki", + "repo.wiki_desc", + 5, + } + + UnitExternalWiki = Unit{ + UnitTypeExternalWiki, + "repo.wiki", + "/wiki", + "repo.wiki_desc", + 5, + } + + UnitSettings = Unit{ + UnitTypeSettings, + "repo.settings", + "/settings", + "repo.settings_desc", + 6, + } + + // defaultRepoUnits contains all the default unit types + defaultRepoUnits = []UnitType{ + UnitTypeCode, + UnitTypeIssues, + UnitTypePullRequests, + UnitTypeCommits, + UnitTypeReleases, + UnitTypeWiki, + UnitTypeSettings, + } + + // MustRepoUnits contains the units could be disabled currently + MustRepoUnits = []UnitType{ + UnitTypeCode, + UnitTypeCommits, + UnitTypeReleases, + UnitTypeSettings, + } + + // Units contains all the units + Units = map[UnitType]Unit{ + UnitTypeCode: UnitCode, + UnitTypeIssues: UnitIssues, + UnitTypeExternalTracker: UnitExternalTracker, + UnitTypePullRequests: UnitPullRequests, + UnitTypeCommits: UnitCommits, + UnitTypeReleases: UnitReleases, + UnitTypeWiki: UnitWiki, + UnitTypeExternalWiki: UnitExternalWiki, + UnitTypeSettings: UnitSettings, + } +) diff --git a/modules/context/repo.go b/modules/context/repo.go index 338a78cb93cea..484adcb4d0bb4 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -479,3 +479,18 @@ func GitHookService() macaron.Handler { } } } + +// UnitTypes returns a macaron middleware to set unit types to context variables. +func UnitTypes() macaron.Handler { + return func(ctx *Context) { + ctx.Data["UnitTypeCode"] = models.UnitTypeCode + ctx.Data["UnitTypeIssues"] = models.UnitTypeIssues + ctx.Data["UnitTypePullRequests"] = models.UnitTypePullRequests + ctx.Data["UnitTypeCommits"] = models.UnitTypeCommits + ctx.Data["UnitTypeReleases"] = models.UnitTypeReleases + ctx.Data["UnitTypeWiki"] = models.UnitTypeWiki + ctx.Data["UnitTypeSettings"] = models.UnitTypeSettings + ctx.Data["UnitTypeExternalWiki"] = models.UnitTypeExternalWiki + ctx.Data["UnitTypeExternalTracker"] = models.UnitTypeExternalTracker + } +} diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index 55622da1d82a2..6f846eb357f82 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -199,7 +199,7 @@ func orgAssignment(args ...bool) macaron.Handler { } func mustEnableIssues(ctx *context.APIContext) { - if !ctx.Repo.Repository.EnableIssues || ctx.Repo.Repository.EnableExternalTracker { + if !ctx.Repo.Repository.EnableUnit(models.UnitTypeIssues) { ctx.Status(404) return } diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 50995e70fe51c..e4ddcc0678c09 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -59,13 +59,15 @@ var ( // MustEnableIssues check if repository enable internal issues func MustEnableIssues(ctx *context.Context) { - if !ctx.Repo.Repository.EnableIssues { + if !ctx.Repo.Repository.EnableUnit(models.UnitTypeIssues) && + !ctx.Repo.Repository.EnableUnit(models.UnitTypeExternalTracker) { ctx.Handle(404, "MustEnableIssues", nil) return } - if ctx.Repo.Repository.EnableExternalTracker { - ctx.Redirect(ctx.Repo.Repository.ExternalTrackerURL) + unit, err := ctx.Repo.Repository.GetUnit(models.UnitTypeExternalTracker) + if err == nil { + ctx.Redirect(unit.Config["ExternalTrackerURL"]) return } } diff --git a/routers/repo/setting.go b/routers/repo/setting.go index e29f0fcb1f3cf..ce11dd252f738 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -143,18 +143,66 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) { ctx.Redirect(repo.Link() + "/settings") case "advanced": - repo.EnableWiki = form.EnableWiki - repo.EnableExternalWiki = form.EnableExternalWiki - repo.ExternalWikiURL = form.ExternalWikiURL - repo.EnableIssues = form.EnableIssues - repo.EnableExternalTracker = form.EnableExternalTracker - repo.ExternalTrackerURL = form.ExternalTrackerURL - repo.ExternalTrackerFormat = form.TrackerURLFormat - repo.ExternalTrackerStyle = form.TrackerIssueStyle - repo.EnablePulls = form.EnablePulls + var units []models.RepoUnit + + for _, tp := range models.MustRepoUnits { + units = append(units, models.RepoUnit{ + RepoID: repo.ID, + Type: tp, + Index: int(tp), + }) + } + + if form.EnableWiki { + if form.EnableExternalWiki { + units = append(units, models.RepoUnit{ + RepoID: repo.ID, + Type: models.UnitTypeExternalWiki, + Index: int(models.UnitTypeExternalWiki), + Config: map[string]string{ + "ExternalWikiURL": form.ExternalWikiURL, + }, + }) + } else { + units = append(units, models.RepoUnit{ + RepoID: repo.ID, + Type: models.UnitTypeWiki, + Index: int(models.UnitTypeWiki), + }) + } + } - if err := models.UpdateRepository(repo, false); err != nil { - ctx.Handle(500, "UpdateRepository", err) + if form.EnableIssues { + if form.EnableExternalTracker { + units = append(units, models.RepoUnit{ + RepoID: repo.ID, + Type: models.UnitTypeExternalWiki, + Index: int(models.UnitTypeExternalWiki), + Config: map[string]string{ + "ExternalTrackerURL": form.ExternalTrackerURL, + "ExternalTrackerFormat": form.TrackerURLFormat, + "ExternalTrackerStyle": form.TrackerIssueStyle, + }, + }) + } else { + units = append(units, models.RepoUnit{ + RepoID: repo.ID, + Type: models.UnitTypeIssues, + Index: int(models.UnitTypeIssues), + }) + } + } + + if form.EnablePulls { + units = append(units, models.RepoUnit{ + RepoID: repo.ID, + Type: models.UnitTypePullRequests, + Index: int(models.UnitTypePullRequests), + }) + } + + if err := models.UpdateRepositoryUnits(repo, units); err != nil { + ctx.Handle(500, "UpdateRepositoryUnits", err) return } log.Trace("Repository advanced settings updated: %s/%s", ctx.Repo.Owner.Name, repo.Name) @@ -281,11 +329,11 @@ func SettingsPost(ctx *context.Context, form auth.RepoSettingForm) { repo.DeleteWiki() log.Trace("Repository wiki deleted: %s/%s", ctx.Repo.Owner.Name, repo.Name) - repo.EnableWiki = false + /*repo.EnableWiki = false if err := models.UpdateRepository(repo, false); err != nil { ctx.Handle(500, "UpdateRepository", err) return - } + }*/ ctx.Flash.Success(ctx.Tr("repo.settings.wiki_deletion_success")) ctx.Redirect(ctx.Repo.RepoLink + "/settings") diff --git a/routers/repo/wiki.go b/routers/repo/wiki.go index ac979c1a9c37a..ae474359633e1 100644 --- a/routers/repo/wiki.go +++ b/routers/repo/wiki.go @@ -27,13 +27,15 @@ const ( // MustEnableWiki check if wiki is enabled, if external then redirect func MustEnableWiki(ctx *context.Context) { - if !ctx.Repo.Repository.EnableWiki { + if !ctx.Repo.Repository.EnableUnit(models.UnitTypeWiki) && + !ctx.Repo.Repository.EnableUnit(models.UnitTypeExternalWiki) { ctx.Handle(404, "MustEnableWiki", nil) return } - if ctx.Repo.Repository.EnableExternalWiki { - ctx.Redirect(ctx.Repo.Repository.ExternalWikiURL) + unit, err := ctx.Repo.Repository.GetUnit(models.UnitTypeExternalWiki) + if err == nil { + ctx.Redirect(unit.Config["ExternalWikiURL"]) return } } diff --git a/routers/user/home.go b/routers/user/home.go index 571849df3041e..b4c62186d72ee 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -223,7 +223,7 @@ func Issues(ctx *context.Context) { for _, repo := range repos { if (isPullList && repo.NumPulls == 0) || (!isPullList && - (!repo.EnableIssues || repo.EnableExternalTracker || repo.NumIssues == 0)) { + (!repo.EnableUnit(models.UnitTypeIssues) || repo.NumIssues == 0)) { continue } diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 9b94e799a74a6..ab788a4f48d01 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -49,30 +49,48 @@ {{if not (or .IsBareRepo .IsDiffCompare)}}
+ {{if .Repository.EnableUnit $.UnitTypeCode}} {{.i18n.Tr "repo.code"}} - {{if .Repository.EnableIssues}} + {{end}} + + {{if .Repository.EnableUnit $.UnitTypeIssues}} + + {{.i18n.Tr "repo.issues"}} {{.Repository.NumOpenIssues}} + + {{end}} + + {{if .Repository.EnableUnit $.UnitTypeExternalTracker}} - {{.i18n.Tr "repo.issues"}} {{if not .Repository.EnableExternalTracker}}{{.Repository.NumOpenIssues}}{{end}} + {{.i18n.Tr "repo.issues"}} {{end}} + {{if .Repository.AllowsPulls}} {{.i18n.Tr "repo.pulls"}} {{.Repository.NumOpenPulls}} {{end}} + + {{if .Repository.EnableUnit $.UnitTypeCommits}} {{.i18n.Tr "repo.commits"}} {{.CommitsCount}} + {{end}} + + {{if .Repository.EnableUnit $.UnitTypeReleases}} {{.i18n.Tr "repo.releases"}} {{.Repository.NumTags}} - {{if .Repository.EnableWiki}} + {{end}} + + {{if or (.Repository.EnableUnit $.UnitTypeWiki) (.Repository.EnableUnit $.UnitTypeExternalWiki)}} {{.i18n.Tr "repo.wiki"}} {{end}} + {{if .IsRepositoryAdmin}}
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index 2588966c9dcfd..e0aaff02f88cd 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -114,26 +114,26 @@
- +
-
+
- +
- +
-
+
- +

{{.i18n.Tr "repo.settings.external_wiki_url_desc"}}

@@ -143,45 +143,47 @@
- +
-
+
- +
- +
-
+
- +

{{.i18n.Tr "repo.settings.external_tracker_url_desc"}}

- +

{{.i18n.Tr "repo.settings.tracker_url_format_desc" | Str2html}}

- + {{$externalTracker := (.Repository.MustGetUnit $.UnitTypeExternalTracker)}} + {{$externalTrackerStyle := $externalTracker.Config.ExternalTrackerStyle}} +
- +
@@ -195,7 +197,7 @@
- +
@@ -236,7 +238,7 @@
- {{if .Repository.EnableWiki}} + {{if .Repository.EnableUnit $.UnitTypeWiki}}
@@ -370,7 +372,7 @@
- {{if .Repository.EnableWiki}} + {{if .Repository.EnableUnit $.UnitTypeWiki}} @@ -163,12 +163,12 @@
- +

{{.i18n.Tr "repo.settings.external_tracker_url_desc"}}

- +

{{.i18n.Tr "repo.settings.tracker_url_format_desc" | Str2html}}

@@ -176,14 +176,14 @@
{{$externalTracker := (.Repository.MustGetUnit $.UnitTypeExternalTracker)}} - {{$externalTrackerStyle := $externalTracker.Config.ExternalTrackerStyle}} + {{$externalTrackerStyle := $externalTracker.ExternalTrackerConfig.ExternalTrackerStyle}}
- +
From ff43acedee8cad7027a3735be50c28f4337d0ac4 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Tue, 31 Jan 2017 23:27:00 +0800 Subject: [PATCH 5/7] fix lint --- indexers/issues.bleve/index_meta.json | 1 + indexers/issues.bleve/store | Bin 0 -> 262144 bytes models/repo_unit.go | 7 +++++++ 3 files changed, 8 insertions(+) create mode 100644 indexers/issues.bleve/index_meta.json create mode 100644 indexers/issues.bleve/store diff --git a/indexers/issues.bleve/index_meta.json b/indexers/issues.bleve/index_meta.json new file mode 100644 index 0000000000000..08f58f41b076d --- /dev/null +++ b/indexers/issues.bleve/index_meta.json @@ -0,0 +1 @@ +{"storage":"boltdb","index_type":"upside_down"} \ No newline at end of file diff --git a/indexers/issues.bleve/store b/indexers/issues.bleve/store new file mode 100644 index 0000000000000000000000000000000000000000..91229ec4c248d23e89411cf306ba465895a4e287 GIT binary patch literal 262144 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

3x7`dGs2$|{wv{63V%ZQm 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 Date: Tue, 31 Jan 2017 23:27:37 +0800 Subject: [PATCH 6/7] rm wrong files --- indexers/issues.bleve/index_meta.json | 1 - indexers/issues.bleve/store | Bin 262144 -> 0 bytes 2 files changed, 1 deletion(-) delete mode 100644 indexers/issues.bleve/index_meta.json delete mode 100644 indexers/issues.bleve/store diff --git a/indexers/issues.bleve/index_meta.json b/indexers/issues.bleve/index_meta.json deleted file mode 100644 index 08f58f41b076d..0000000000000 --- a/indexers/issues.bleve/index_meta.json +++ /dev/null @@ -1 +0,0 @@ -{"storage":"boltdb","index_type":"upside_down"} \ No newline at end of file diff --git a/indexers/issues.bleve/store b/indexers/issues.bleve/store deleted file mode 100644 index 91229ec4c248d23e89411cf306ba465895a4e287..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 262144 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

3x7`dGs2$|{wv{63V%ZQm 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 Date: Wed, 1 Feb 2017 11:30:36 +0800 Subject: [PATCH 7/7] fix tests --- models/repo_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/models/repo_test.go b/models/repo_test.go index 390ff2afcb1eb..42bde62b4606d 100644 --- a/models/repo_test.go +++ b/models/repo_test.go @@ -16,8 +16,8 @@ func TestRepo(t *testing.T) { repo.Owner.Name = "testuser" externalTracker := RepoUnit{ Type: UnitTypeExternalTracker, - Config: map[string]string{ - "ExternalTrackerFormat": "https://someurl.com/{user}/{repo}/{issue}", + Config: &ExternalTrackerConfig{ + ExternalTrackerFormat: "https://someurl.com/{user}/{repo}/{issue}", }, } repo.Units = []*RepoUnit{ @@ -44,12 +44,12 @@ func TestRepo(t *testing.T) { So(metas["style"], ShouldEqual, markdown.IssueNameStyleNumeric) }) Convey("It should pass through numeric issue style setting", func() { - externalTracker.Config["ExternalTrackerStyle"] = markdown.IssueNameStyleNumeric + externalTracker.ExternalTrackerConfig().ExternalTrackerStyle = markdown.IssueNameStyleNumeric metas := repo.ComposeMetas() So(metas["style"], ShouldEqual, markdown.IssueNameStyleNumeric) }) Convey("It should pass through alphanumeric issue style setting", func() { - externalTracker.Config["ExternalTrackerStyle"] = markdown.IssueNameStyleAlphanumeric + externalTracker.ExternalTrackerConfig().ExternalTrackerStyle = markdown.IssueNameStyleAlphanumeric metas := repo.ComposeMetas() So(metas["style"], ShouldEqual, markdown.IssueNameStyleAlphanumeric) })