@@ -34,8 +34,14 @@ func (l *LFSLock) BeforeInsert() {
34
34
35
35
// AfterLoad is invoked from XORM after setting the values of all fields of this object.
36
36
func (l * LFSLock ) AfterLoad () {
37
- l .Owner , _ = GetUserByID (l .OwnerID )
37
+ l .Owner , err = GetUserByID (l .OwnerID )
38
+ if err != nil {
39
+ log .Error (2 , "LFS lock AfterLoad failed OwnerId[%d] not found: %v" , l .OwnerID , err )
40
+ }
38
41
l .Repo , _ = GetRepositoryByID (l .RepoID )
42
+ if err != nil {
43
+ log .Error (2 , "LFS lock AfterLoad failed RepoId[%d] not found: %v" , l .RepoID , err )
44
+ }
39
45
}
40
46
41
47
func cleanPath (p string ) string {
@@ -56,7 +62,7 @@ func (l *LFSLock) APIFormat() *api.LFSLock {
56
62
57
63
// CreateLFSLock creates a new lock.
58
64
func CreateLFSLock (lock * LFSLock ) (* LFSLock , error ) {
59
- err := CheckLFSAccessForRepo (lock .Owner , lock .Repo , true )
65
+ err := CheckLFSAccessForRepo (lock .Owner , lock .Repo , AccessModeWrite )
60
66
if err != nil {
61
67
return nil , err
62
68
}
@@ -112,7 +118,7 @@ func DeleteLFSLockByID(id int64, u *User, force bool) (*LFSLock, error) {
112
118
return nil , err
113
119
}
114
120
115
- err = CheckLFSAccessForRepo (u , lock .Repo , true )
121
+ err = CheckLFSAccessForRepo (u , lock .Repo , AccessModeWrite )
116
122
if err != nil {
117
123
return nil , err
118
124
}
@@ -126,15 +132,10 @@ func DeleteLFSLockByID(id int64, u *User, force bool) (*LFSLock, error) {
126
132
}
127
133
128
134
//CheckLFSAccessForRepo check needed access mode base on action
129
- func CheckLFSAccessForRepo (u * User , repo * Repository , reqWrt bool ) error {
135
+ func CheckLFSAccessForRepo (u * User , repo * Repository , mode AccessMode ) error {
130
136
if u == nil {
131
- return ErrLFSUnauthorizedAction {repo .ID , "undefined" , reqWrt }
132
- }
133
- mode := AccessModeRead
134
- if reqWrt {
135
- mode = AccessModeWrite
137
+ return ErrLFSUnauthorizedAction {repo .ID , "undefined" , mode }
136
138
}
137
-
138
139
has , err := HasAccess (u .ID , repo , mode )
139
140
if err != nil {
140
141
return err
0 commit comments