evan/tank
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix the matter move bug.

Browse Source
This commit is contained in:
zicla
2018-01-09 17:50:35 +08:00
parent 9342dfc9d9
commit a25c9d7b24
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rest/matter_controller.go
View File

@ -104,9 +104,6 @@ func (this *MatterController) CreateDirectory(writer http.ResponseWriter, reques
} }
user = this.userDao.CheckByUuid(userUuid) user = this.userDao.CheckByUuid(userUuid)
if puuid != "" && puuid != "root" { if puuid != "" && puuid != "root" {
//找出上一级的文件夹。 //找出上一级的文件夹。
this.matterDao.FindByUuidAndUserUuid(puuid, user.Uuid) this.matterDao.FindByUuidAndUserUuid(puuid, user.Uuid)
@ -389,11 +386,12 @@ func (this *MatterController) Move(writer http.ResponseWriter, request *http.Req
user = this.userDao.CheckByUuid(userUuid) user = this.userDao.CheckByUuid(userUuid)
//验证dest是否有问题 //验证dest是否有问题
var destMatter *Matter
if destUuid == "" { if destUuid == "" {
return this.Error("destUuid参数必填") return this.Error("destUuid参数必填")
} else { } else {
if destUuid != "root" { if destUuid != "root" {
destMatter := this.matterDao.FindByUuid(destUuid) destMatter = this.matterDao.FindByUuid(destUuid)
if user.Role != USER_ROLE_ADMINISTRATOR && destMatter.UserUuid != user.Uuid { if user.Role != USER_ROLE_ADMINISTRATOR && destMatter.UserUuid != user.Uuid {
return this.Error(RESULT_CODE_UNAUTHORIZED) return this.Error(RESULT_CODE_UNAUTHORIZED)
@ -422,6 +420,14 @@ func (this *MatterController) Move(writer http.ResponseWriter, request *http.Req
return this.Error("【" + srcMatter.Name + "】在目标文件夹已经存在了，操作失败。") return this.Error("【" + srcMatter.Name + "】在目标文件夹已经存在了，操作失败。")
} }
//判断和目标文件夹是否是同一个主人。
if destUuid != "root" {
if srcMatter.UserUuid != destMatter.UserUuid {
panic("文件和目标文件夹的拥有者不是同一人")
}
}
srcMatters = append(srcMatters, srcMatter) srcMatters = append(srcMatters, srcMatter)
} }