Add: rename user

2 files changed, 18 insertions, 7 deletions

diff --git a/routers/repo/repo.go b/routers/repo/repo.go
index a55647a314..ae51c55139 100644
--- a/routers/repo/repo.go
+++ b/routers/repo/repo.go
@@ -291,7 +291,7 @@ func SettingPost(ctx *middleware.Context) {
 				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)
+				ctx.Handle(404, "repo.SettingPost(change repository name)", err)
 				return
 			}
 			log.Trace("%s Repository name changed: %s/%s -> %s", ctx.Req.RequestURI, ctx.User.Name, ctx.Repo.Repository.Name, newRepoName)
diff --git a/routers/user/setting.go b/routers/user/setting.go
index 75adf2b81d..4b6d88a362 100644
--- a/routers/user/setting.go
+++ b/routers/user/setting.go
@@ -23,15 +23,27 @@ func Setting(ctx *middleware.Context, form auth.UpdateProfileForm) {
 	user := ctx.User
 	ctx.Data["Owner"] = user
 
-	if ctx.Req.Method == "GET" {
+	if ctx.Req.Method == "GET" || ctx.HasError() {
 		ctx.HTML(200, "user/setting")
 		return
 	}
 
-	// below is for POST requests
-	if hasErr, ok := ctx.Data["HasError"]; ok && hasErr.(bool) {
-		ctx.HTML(200, "user/setting")
-		return
+	// Check if user name has been changed.
+	if user.Name != form.UserName {
+		isExist, err := models.IsUserExist(form.UserName)
+		if err != nil {
+			ctx.Handle(404, "user.Setting(update: check existence)", err)
+			return
+		} else if isExist {
+			ctx.RenderWithErr("User name has been taken.", "user/setting", &form)
+			return
+		} else if err = models.ChangeUserName(user, form.UserName); err != nil {
+			ctx.Handle(404, "user.Setting(change user name)", err)
+			return
+		}
+		log.Trace("%s User name changed: %s -> %s", ctx.Req.RequestURI, user.Name, form.UserName)
+
+		user.Name = form.UserName
 	}
 
 	user.Email = form.Email
@@ -46,7 +58,6 @@ func Setting(ctx *middleware.Context, form auth.UpdateProfileForm) {
 
 	ctx.Data["IsSuccess"] = true
 	ctx.HTML(200, "user/setting")
-
 	log.Trace("%s User setting updated: %s", ctx.Req.RequestURI, ctx.User.LowerName)
 }
 

path: root/routers

# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# 
# Translators:
msgid ""
msgstr ""
"Project-Id-Version: ownCloud\n"
"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
"POT-Creation-Date: 2012-07-28 02:02+0200\n"
"PO-Revision-Date: 2012-07-27 22:17+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"

#: appinfo/app.php:14
msgid "Bookmarks"
msgstr ""

#: bookmarksHelper.php:99
msgid "unnamed"
msgstr ""

#: templates/bookmarklet.php:5
msgid ""
"Drag this to your browser bookmarks and click it, when you want to bookmark "
"a webpage quickly:"
msgstr ""

#: templates/bookmarklet.php:7
msgid "Read later"
msgstr ""

#: templates/list.php:13
msgid "Address"
msgstr ""

#: templates/list.php:14
msgid "Title"
msgstr ""

#: templates/list.php:15
msgid "Tags"
msgstr ""

#: templates/list.php:16
msgid "Save bookmark"
msgstr ""

#: templates/list.php:22
msgid "You have no bookmarks"
msgstr ""

#: templates/settings.php:11
msgid "Bookmarklet <br />"
msgstr ""