Bläddra i källkod

Add: rename repository

Unknown 11 år sedan
förälder
incheckning
79a610592e
5 ändrade filer med 71 tillägg och 7 borttagningar
  1. 8 0
      models/access.go
  2. 21 1
      models/repo.go
  3. 3 1
      modules/middleware/context.go
  4. 30 4
      routers/repo/repo.go
  5. 9 1
      templates/repo/setting.tmpl

+ 8 - 0
models/access.go

@@ -32,6 +32,14 @@ func AddAccess(access *Access) error {
 	return err
 	return err
 }
 }
 
 
+// UpdateAccess updates access information.
+func UpdateAccess(access *Access) error {
+	access.UserName = strings.ToLower(access.UserName)
+	access.RepoName = strings.ToLower(access.RepoName)
+	_, err := orm.Id(access.Id).Update(access)
+	return err
+}
+
 // HasAccess returns true if someone can read or write to given repository.
 // HasAccess returns true if someone can read or write to given repository.
 func HasAccess(userName, repoName string, mode int) (bool, error) {
 func HasAccess(userName, repoName string, mode int) (bool, error) {
 	return orm.Get(&Access{
 	return orm.Get(&Access{

+ 21 - 1
models/repo.go

@@ -369,14 +369,34 @@ func RepoPath(userName, repoName string) string {
 	return filepath.Join(UserPath(userName), strings.ToLower(repoName)+".git")
 	return filepath.Join(UserPath(userName), strings.ToLower(repoName)+".git")
 }
 }
 
 
+// ChangeRepositoryName changes all corresponding setting from old repository name to new one.
+func ChangeRepositoryName(userName, oldRepoName, newRepoName string) (err error) {
+	// Update accesses.
+	accesses := make([]Access, 0, 5)
+	err = orm.Find(&accesses, &Access{RepoName: strings.ToLower(userName + "/" + oldRepoName)})
+	if err != nil {
+		return err
+	}
+	for i := range accesses {
+		accesses[i].RepoName = userName + "/" + newRepoName
+		if err = UpdateAccess(&accesses[i]); err != nil {
+			return err
+		}
+	}
+
+	// Change repository directory name.
+	return os.Rename(RepoPath(userName, oldRepoName), RepoPath(userName, newRepoName))
+}
+
 func UpdateRepository(repo *Repository) error {
 func UpdateRepository(repo *Repository) error {
+	repo.LowerName = strings.ToLower(repo.Name)
+
 	if len(repo.Description) > 255 {
 	if len(repo.Description) > 255 {
 		repo.Description = repo.Description[:255]
 		repo.Description = repo.Description[:255]
 	}
 	}
 	if len(repo.Website) > 255 {
 	if len(repo.Website) > 255 {
 		repo.Website = repo.Website[:255]
 		repo.Website = repo.Website[:255]
 	}
 	}
-
 	_, err := orm.Id(repo.Id).AllCols().Update(repo)
 	_, err := orm.Id(repo.Id).AllCols().Update(repo)
 	return err
 	return err
 }
 }

+ 3 - 1
modules/middleware/context.go

@@ -90,7 +90,9 @@ func (ctx *Context) HTML(status int, name string, htmlOpt ...HTMLOptions) {
 func (ctx *Context) RenderWithErr(msg, tpl string, form auth.Form) {
 func (ctx *Context) RenderWithErr(msg, tpl string, form auth.Form) {
 	ctx.Data["HasError"] = true
 	ctx.Data["HasError"] = true
 	ctx.Data["ErrorMsg"] = msg
 	ctx.Data["ErrorMsg"] = msg
-	auth.AssignForm(form, ctx.Data)
+	if form != nil {
+		auth.AssignForm(form, ctx.Data)
+	}
 	ctx.HTML(200, tpl)
 	ctx.HTML(200, tpl)
 }
 }
 
 

+ 30 - 4
routers/repo/repo.go

@@ -5,6 +5,7 @@
 package repo
 package repo
 
 
 import (
 import (
+	"fmt"
 	"path"
 	"path"
 	"path/filepath"
 	"path/filepath"
 	"strings"
 	"strings"
@@ -278,19 +279,44 @@ func SettingPost(ctx *middleware.Context) {
 
 
 	switch ctx.Query("action") {
 	switch ctx.Query("action") {
 	case "update":
 	case "update":
+		isNameChanged := false
+		newRepoName := ctx.Query("name")
+		// Check if repository name has been changed.
+		if ctx.Repo.Repository.Name != newRepoName {
+			isExist, err := models.IsRepositoryExist(ctx.Repo.Owner, newRepoName)
+			if err != nil {
+				ctx.Handle(404, "repo.SettingPost(update: check existence)", err)
+				return
+			} else if isExist {
+				ctx.RenderWithErr("Repository name has been taken in your repositories.", "repo/setting", nil)
+				return
+			} else if err = models.ChangeRepositoryName(ctx.Repo.Owner.Name, ctx.Repo.Repository.Name, newRepoName); err != nil {
+				ctx.Handle(404, "repo.SettingPost(update)", err)
+				return
+			}
+			log.Trace("%s Repository name changed: %s/%s -> %s", ctx.Req.RequestURI, ctx.User.Name, ctx.Repo.Repository.Name, newRepoName)
+
+			isNameChanged = true
+			ctx.Repo.Repository.Name = newRepoName
+		}
+
 		ctx.Repo.Repository.Description = ctx.Query("desc")
 		ctx.Repo.Repository.Description = ctx.Query("desc")
 		ctx.Repo.Repository.Website = ctx.Query("site")
 		ctx.Repo.Repository.Website = ctx.Query("site")
 		if err := models.UpdateRepository(ctx.Repo.Repository); err != nil {
 		if err := models.UpdateRepository(ctx.Repo.Repository); err != nil {
 			ctx.Handle(404, "repo.SettingPost(update)", err)
 			ctx.Handle(404, "repo.SettingPost(update)", err)
 			return
 			return
 		}
 		}
+
 		ctx.Data["IsSuccess"] = true
 		ctx.Data["IsSuccess"] = true
-		ctx.HTML(200, "repo/setting")
-		log.Trace("%s Repository updated: %s/%s", ctx.Req.RequestURI, ctx.User.LowerName, ctx.Repo.Repository.LowerName)
+		if isNameChanged {
+			ctx.Redirect(fmt.Sprintf("/%s/%s/settings", ctx.Repo.Owner.Name, ctx.Repo.Repository.Name))
+		} else {
+			ctx.HTML(200, "repo/setting")
+		}
+		log.Trace("%s Repository updated: %s/%s", ctx.Req.RequestURI, ctx.Repo.Owner.Name, ctx.Repo.Repository.Name)
 	case "delete":
 	case "delete":
 		if len(ctx.Repo.Repository.Name) == 0 || ctx.Repo.Repository.Name != ctx.Query("repository") {
 		if len(ctx.Repo.Repository.Name) == 0 || ctx.Repo.Repository.Name != ctx.Query("repository") {
-			ctx.Data["ErrorMsg"] = "Please make sure you entered repository name is correct."
-			ctx.HTML(200, "repo/setting")
+			ctx.RenderWithErr("Please make sure you entered repository name is correct.", "repo/setting", nil)
 			return
 			return
 		}
 		}
 
 

+ 9 - 1
templates/repo/setting.tmpl

@@ -12,7 +12,7 @@
     </div>
     </div>
 
 
     <div id="repo-setting-container" class="col-md-9">
     <div id="repo-setting-container" class="col-md-9">
-        {{if .IsSuccess}}<p class="alert alert-success">Repository option has been successfully updated.</p>{{else if .HasError}}<p class="alert alert-danger form-error">{{.ErrorMsg}}</p>{{end}}
+        {{if .IsSuccess}}<p class="alert alert-success">Repository options has been successfully updated.</p>{{else if .HasError}}<p class="alert alert-danger form-error">{{.ErrorMsg}}</p>{{end}}
         <div class="panel panel-default">
         <div class="panel panel-default">
             <div class="panel-heading">
             <div class="panel-heading">
                 Repository Options
                 Repository Options
@@ -22,12 +22,20 @@
                 <form action="/{{.Owner.Name}}/{{.Repository.Name}}/settings" method="post" class="form-horizontal">
                 <form action="/{{.Owner.Name}}/{{.Repository.Name}}/settings" method="post" class="form-horizontal">
                     {{.CsrfTokenHtml}}
                     {{.CsrfTokenHtml}}
                     <input type="hidden" name="action" value="update">
                     <input type="hidden" name="action" value="update">
+                    <div class="form-group">
+                        <label class="col-md-3 text-right">Name</label>
+                        <div class="col-md-9">
+                            <input class="form-control" name="name" value="{{.Repository.Name}}" />
+                        </div>
+                    </div>
+
                     <div class="form-group">
                     <div class="form-group">
                         <label class="col-md-3 text-right">Description</label>
                         <label class="col-md-3 text-right">Description</label>
                         <div class="col-md-9">
                         <div class="col-md-9">
                             <textarea class="form-control" name="desc" id="repo-desc" rows="3">{{.Repository.Description}}</textarea>
                             <textarea class="form-control" name="desc" id="repo-desc" rows="3">{{.Repository.Description}}</textarea>
                         </div>
                         </div>
                     </div>
                     </div>
+
                     <div class="form-group">
                     <div class="form-group">
                         <label class="col-md-3 text-right">Official Site</label>
                         <label class="col-md-3 text-right">Official Site</label>
                         <div class="col-md-9">
                         <div class="col-md-9">