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

Fix the hard delete feature.

Browse Source
This commit is contained in:
lishuang 2021-01-02 17:31:09 +08:00
parent 3752d42de8
commit 13b6d7f98d
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/rest/matter_controller.go
View File

@ -14,6 +14,7 @@ type MatterController struct {
BaseController BaseController
matterDao *MatterDao matterDao *MatterDao
matterService *MatterService matterService *MatterService
preferenceService *PreferenceService
downloadTokenDao *DownloadTokenDao downloadTokenDao *DownloadTokenDao
imageCacheDao *ImageCacheDao imageCacheDao *ImageCacheDao
shareDao *ShareDao shareDao *ShareDao

7
code/rest/matter_service.go
View File

@ -315,9 +315,16 @@ func (this *MatterService) AtomicSoftDelete(request *http.Request, matter *Matte
this.userService.MatterLock(matter.UserUuid) this.userService.MatterLock(matter.UserUuid)
defer this.userService.MatterUnlock(matter.UserUuid) defer this.userService.MatterUnlock(matter.UserUuid)
//if disabled the recycle feature. then we hard delete.
preference := this.preferenceService.Fetch()
if preference.DeletedKeepDays == 0 {
this.Delete(request, matter, user)
} else {
this.SoftDelete(request, matter, user) this.SoftDelete(request, matter, user)
} }
}
//atomic recovery delete files //atomic recovery delete files
func (this *MatterService) AtomicRecovery(request *http.Request, matter *Matter, user *User) { func (this *MatterService) AtomicRecovery(request *http.Request, matter *Matter, user *User) {