diff --git a/models/namespaces.go b/models/namespaces.go index 161b52ab2da..4707f370920 100644 --- a/models/namespaces.go +++ b/models/namespaces.go @@ -51,6 +51,7 @@ func (user *User) IsNamespaceAdmin(namespace *Namespace) (err error) { return ErrUserNeedsToBeNamespaceAdmin{UserID: user.ID, NamespaceID: namespace.ID} } +// IsAdmin returns true or false if the user is admin on that namespace or not func (n *Namespace) IsAdmin(user *User) bool { // Owners always have admin rights diff --git a/models/namespaces_add_update.go b/models/namespaces_add_update.go index d1545f755b9..eb0eeee166c 100644 --- a/models/namespaces_add_update.go +++ b/models/namespaces_add_update.go @@ -4,7 +4,7 @@ package models func (n *Namespace) Create(doer *User, _ int64) (err error) { // Check if we have at least a name if n.Name == "" { - return ErrNamespaceNameCannotBeEmpty{NamespaceID:0, UserID:doer.ID} + return ErrNamespaceNameCannotBeEmpty{NamespaceID: 0, UserID: doer.ID} } // Check if the User exists @@ -23,7 +23,7 @@ func (n *Namespace) Create(doer *User, _ int64) (err error) { func (n *Namespace) Update(id int64, doer *User) (err error) { // Check if we have at least a name if n.Name == "" { - return ErrNamespaceNameCannotBeEmpty{NamespaceID:id, UserID:doer.ID} + return ErrNamespaceNameCannotBeEmpty{NamespaceID: id, UserID: doer.ID} } n.ID = id @@ -48,10 +48,10 @@ func (n *Namespace) Update(id int64, doer *User) (err error) { } if !currentNamespace.IsAdmin(&user) { - return ErrNeedToBeNamespaceAdmin{NamespaceID:id, UserID:doer.ID} + return ErrNeedToBeNamespaceAdmin{NamespaceID: id, UserID: doer.ID} } // Do the actual update _, err = x.ID(currentNamespace.ID).Update(n) return -} \ No newline at end of file +} diff --git a/routes/crud/update.go b/routes/crud/update.go index 5f15d3373be..042489a99ab 100644 --- a/routes/crud/update.go +++ b/routes/crud/update.go @@ -32,7 +32,6 @@ func (c *WebHandler) UpdateWeb(ctx echo.Context) error { return echo.NewHTTPError(http.StatusForbidden, "You need to be list admin to do that.") } - if models.IsErrNamespaceDoesNotExist(err) { return echo.NewHTTPError(http.StatusNotFound, "The namespace does not exist.") }