implemented delete team <-> namespace relation

models/team_namespace_delete.go

@@ -0,0 +1,24 @@
+package models
+
+// Delete deletes a team <-> namespace relation based on the namespace & team id
+func (tn *TeamNamespace) Delete() (err error) {
+
+	// Check if the namespace exists
+	_, err = GetNamespaceByID(tn.NamespaceID)
+	if err != nil {
+		return
+	}
+
+	// Check if the team exists
+	_, err = GetTeamByID(tn.TeamID)
+	if err != nil {
+		return
+	}
+
+	// Delete the relation
+	_, err = x.Where("team_id = ?", tn.TeamID).
+		And("namespace_id = ?", tn.NamespaceID).
+		Delete(tn)
+
+	return
+}

models/team_namespace_rights.go

@@ -5,3 +5,9 @@ func (tn *TeamNamespace) CanCreate(user *User, _ int64) bool {
 	n, _ := GetNamespaceByID(tn.NamespaceID)
 	return n.IsAdmin(user)
 }
+
+// CanDelete checks if a user can remove a team from a namespace. Only namespace admins can do that.
+func (tn *TeamNamespace) CanDelete(user *User) bool {
+	n, _ := GetNamespaceByID(tn.NamespaceID)
+	return n.IsAdmin(user)
+}

routes/routes.go

@@ -118,7 +118,7 @@ func RegisterRoutes(e *echo.Echo) {
 	}
 	a.GET("/namespaces/:id/teams", namespaceTeamHandler.ReadAllWeb)
 	a.PUT("/namespaces/:id/teams", namespaceTeamHandler.CreateWeb)
-	a.DELETE("/namespaces/:nid/teams/:id", namespaceTeamHandler.DeleteWeb)
+	a.DELETE("/namespaces/:nid/teams/:teamid", namespaceTeamHandler.DeleteWeb)
 
 	teamHandler := &crud.WebHandler{
 		CObject: &models.Team{},