diff options
| author | David Svantesson <davidsvantesson@gmail.com> | 2019-09-23 22:08:03 +0200 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2019-09-23 23:08:03 +0300 |
| commit | a0e88dfc2e5cc811facf8f96d0c6ca22dc49b9e1 (patch) | |
| tree | a40e42bb05f62acaf64e0af5b49142985387ab42 /models/org.go | |
| parent | 63ff61615ec6aaa25887f8ce605c9082c106a34b (diff) | |
| download | gitea-a0e88dfc2e5cc811facf8f96d0c6ca22dc49b9e1.tar.gz gitea-a0e88dfc2e5cc811facf8f96d0c6ca22dc49b9e1.zip | |
Add teams to repo on collaboration page. (#8045)
* Add teams to repo on collaboration page.
Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
* Add option for repository admins to change teams access to repo.
Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
* Add comment for functions
Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
* Make RepoAdminChangeTeamAccess default false in xorm and make it default checked in template instead.
Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
* Make proper language strings and fix error redirection.
* Add unit tests for adding and deleting team from repository.
Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
* Add database migration
Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
* Fix redirect
Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
* Fix locale string mismatch.
Signed-off-by: David Svantesson <davidsvantesson@gmail.com>
* Move team access mode text logic to template.
* Move collaborator access mode text logic to template.
Diffstat (limited to 'models/org.go')
| -rw-r--r-- | models/org.go | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/models/org.go b/models/org.go index e00bef5798..ca3bce81a1 100644 --- a/models/org.go +++ b/models/org.go @@ -6,7 +6,6 @@ package models import ( - "errors" "fmt" "os" "strings" @@ -20,11 +19,6 @@ import ( "xorm.io/builder" ) -var ( - // ErrTeamNotExist team does not exist - ErrTeamNotExist = errors.New("Team does not exist") -) - // IsOwnedBy returns true if given user is in the owner team. func (org *User) IsOwnedBy(uid int64) (bool, error) { return IsOrganizationOwner(org.ID, uid) @@ -304,7 +298,7 @@ type OrgUser struct { func isOrganizationOwner(e Engine, orgID, uid int64) (bool, error) { ownerTeam, err := getOwnerTeam(e, orgID) if err != nil { - if err == ErrTeamNotExist { + if IsErrTeamNotExist(err) { log.Error("Organization does not have owner team: %d", orgID) return false, nil } |