diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2021-11-24 17:49:20 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-24 17:49:20 +0800 |
| commit | a666829a37be6f9fd98f9e7dd1767c420f7f3b32 (patch) | |
| tree | 9ab1434b759a8a2cb275a83149903a823851e309 /models/lfs.go | |
| parent | 4e7ca946da2a2642a62f114825129bf5d7ed9196 (diff) | |
| download | gitea-a666829a37be6f9fd98f9e7dd1767c420f7f3b32.tar.gz gitea-a666829a37be6f9fd98f9e7dd1767c420f7f3b32.zip | |
Move user related model into models/user (#17781)
* Move user related model into models/user
* Fix lint for windows
* Fix windows lint
* Fix windows lint
* Move some tests in models
* Merge
Diffstat (limited to 'models/lfs.go')
| -rw-r--r-- | models/lfs.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/models/lfs.go b/models/lfs.go index 40539d2b78..da5e61ed0b 100644 --- a/models/lfs.go +++ b/models/lfs.go @@ -8,6 +8,7 @@ import ( "errors" "code.gitea.io/gitea/models/db" + user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/lfs" "code.gitea.io/gitea/modules/timeutil" @@ -132,7 +133,7 @@ func (repo *Repository) CountLFSMetaObjects() (int64, error) { } // LFSObjectAccessible checks if a provided Oid is accessible to the user -func LFSObjectAccessible(user *User, oid string) (bool, error) { +func LFSObjectAccessible(user *user_model.User, oid string) (bool, error) { if user.IsAdmin { count, err := db.GetEngine(db.DefaultContext).Count(&LFSMetaObject{Pointer: lfs.Pointer{Oid: oid}}) return count > 0, err @@ -143,7 +144,7 @@ func LFSObjectAccessible(user *User, oid string) (bool, error) { } // LFSAutoAssociate auto associates accessible LFSMetaObjects -func LFSAutoAssociate(metas []*LFSMetaObject, user *User, repoID int64) error { +func LFSAutoAssociate(metas []*LFSMetaObject, user *user_model.User, repoID int64) error { ctx, committer, err := db.TxContext() if err != nil { return err |