wangxuming/XQKqueue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复项目无法删除问题

Browse Source
This commit is contained in:
brother7
2026-08-13 20:42:09 +08:00
parent cb88a69012
commit a407e69ba7
18 changed files with 623 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
server/internal/httpapi/auth.go
View File

@@ -86,7 +86,9 @@ func (s *Server) authorizeProject(ctx context.Context, projectID string) error {
}
var count int64
if err := s.db.WithContext(ctx).Model(&model.UserProject{}).
Where("user_id = ? AND project_id = ?", user.ID, projectID).Count(&count).Error; err != nil {
Joins("JOIN projects ON projects.id = user_projects.project_id").
Where("user_projects.user_id = ? AND user_projects.project_id = ? AND projects.archived_at IS NULL", user.ID, projectID).
Count(&count).Error; err != nil {
return err
}
if count == 0 {
@@ -219,7 +221,8 @@ func userView(user model.User) map[string]any {
func (s *Server) projectsForUser(ctx context.Context, user model.User) ([]model.Project, error) {
var projects []model.Project
query := s.db.WithContext(ctx).Model(&model.Project{}).Order("name ASC")
query := s.db.WithContext(ctx).Model(&model.Project{}).
Where("projects.archived_at IS NULL").Order("projects.name ASC")
if user.Role != model.RoleAdmin {
query = query.Joins("JOIN user_projects ON user_projects.project_id = projects.id").
Where("user_projects.user_id = ?", user.ID)