Skip to content

Commit 9da17c1

Browse files
fix
1 parent e2080e8 commit 9da17c1

File tree

1 file changed

+6
-14
lines changed

1 file changed

+6
-14
lines changed

models/repo_collaboration.go

+6-14
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,15 @@ func (repo *Repository) addCollaborator(e Engine, u *User) error {
5050
func (repo *Repository) AddCollaborator(u *User) error {
5151
sess := x.NewSession()
5252
defer sess.Close()
53-
if err = sess.Begin(); err != nil {
54-
return err
55-
}
56-
57-
if err = repo.addCollaborator(sess, u); err != nil {
53+
if err := sess.Begin(); err != nil {
5854
return err
5955
}
6056

61-
if err = sess.Commit(); err != nil {
57+
if err := repo.addCollaborator(sess, u); err != nil {
6258
return err
6359
}
6460

65-
return nil
61+
return sess.Commit()
6662
}
6763

6864
func (repo *Repository) getCollaborations(e Engine) ([]*Collaboration, error) {
@@ -148,19 +144,15 @@ func (repo *Repository) changeCollaborationAccessMode(e Engine, uid int64, mode
148144
func (repo *Repository) ChangeCollaborationAccessMode(uid int64, mode AccessMode) error {
149145
sess := x.NewSession()
150146
defer sess.Close()
151-
if err = sess.Begin(); err != nil {
152-
return err
153-
}
154-
155-
if err = repo.changeCollaborationAccessMode(sess, uid, mode); err != nil {
147+
if err := sess.Begin(); err != nil {
156148
return err
157149
}
158150

159-
if err = sess.Commit(); err != nil {
151+
if err := repo.changeCollaborationAccessMode(sess, uid, mode); err != nil {
160152
return err
161153
}
162154

163-
return nil
155+
return sess.Commit()
164156
}
165157

166158
// DeleteCollaboration removes collaboration relation between the user and repository.

0 commit comments

Comments
 (0)