Pack 3.0.0.Beta2

code/rest/user_controller.go

@@ -47,6 +47,10 @@ func (this *UserController) RegisterRoutes() map[string]func(writer http.Respons
 
 func (this *UserController) innerLogin(writer http.ResponseWriter, request *http.Request, user *User) {
 
+	if user.Status == USER_STATUS_DISABLED {
+		panic(result.BadRequestI18n(request, i18n.UserDisabled))
+	}
+
 	//set cookie. expire after 30 days.
 	expiration := time.Now()
 	expiration = expiration.AddDate(0, 0, 30)
@@ -160,13 +164,16 @@ func (this *UserController) Register(writer http.ResponseWriter, request *http.R
 
 func (this *UserController) Edit(writer http.ResponseWriter, request *http.Request) *result.WebResult {
 
-	avatarUrl := request.FormValue("avatarUrl")
 	uuid := request.FormValue("uuid")
+	avatarUrl := request.FormValue("avatarUrl")
 	sizeLimitStr := request.FormValue("sizeLimit")
+	totalSizeLimitStr := request.FormValue("totalSizeLimit")
 
 	user := this.checkUser(request)
 	currentUser := this.userDao.CheckByUuid(uuid)
 
+	currentUser.AvatarUrl = avatarUrl
+
 	if user.Role == USER_ROLE_ADMINISTRATOR {
 		//only admin can edit user's sizeLimit
 		var sizeLimit int64 = 0
@@ -180,12 +187,23 @@ func (this *UserController) Edit(writer http.ResponseWriter, request *http.Reque
 			sizeLimit = int64(intSizeLimit)
 		}
 		currentUser.SizeLimit = sizeLimit
+
+		var totalSizeLimit int64 = 0
+		if totalSizeLimitStr == "" {
+			panic("user's total limit size is required")
+		} else {
+			intTotalSizeLimit, err := strconv.Atoi(totalSizeLimitStr)
+			if err != nil {
+				this.PanicError(err)
+			}
+			totalSizeLimit = int64(intTotalSizeLimit)
+		}
+		currentUser.TotalSizeLimit = totalSizeLimit
+
 	} else if user.Uuid != uuid {
 		panic(result.UNAUTHORIZED)
 	}
 
-	currentUser.AvatarUrl = avatarUrl
-
 	currentUser = this.userDao.Save(currentUser)
 
 	return this.Success(currentUser)