Skip to content

Manage User Badges in the UI #31262

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
wants to merge 19 commits into
base: main
Choose a base branch
from
Open

Manage User Badges in the UI #31262

wants to merge 19 commits into from
+1,106 −14

Conversation

HenriquerPimentel
Copy link
Contributor

Implemented #29798

This feature implements:

  • List all badges (screenshot)
  • Create new badges (screenshot)
  • View badge (screenshot)
  • Edit badge (screenshot)
  • Add user to badge (screenshot)

Implemented Badge Management in administration panel

  1. Updated badge model (models/user/badge.go)
  2. Added new type of errors ErrBadgeAlreadyExist and ErrBadgeNotExist (models/user/error.go)
  3. Implemented badge service methods (services/user/badge.go)
  4. Implemented new type of form AdminCreateBadgeForm (services/forms/admin.go)
  5. Implemented new binding rules to check if ImageURL is valid and if is Slug Pattern (modules/validation/binding.go) (modules/web/middleware.go) (modules/validation/helpers.go)
  6. Implemented badge search (routers/web/explore/badge.go) (routers/web/admin/badges.go)
  7. Implemented badges routing (routers/web/web.go)
  8. Implemented templates for create/list/edit/view badges (templates/admin/badge/*) (templates/admin/navbar.tmpl)
    9 Added new translation phrases (en-US): search.badge_kind, form.ImageURL, form.invalid_image_url_error, form.slug_been_taken, admin.badges, admin.badges.badges_manage_panel, admin.badges.details, admin.badges.new_badge, admin.badges.slug, admin.badges.description, admin.badges.image_url, admin.badges.slug.must_fill, admin.badges.new_success, admin.badges.update_success, admin.badges.deletion_success, admin.badges.edit_badge, admin.badges.update_badge, admin.badges.delete_badge, admin.badges.delete_badge_desc

Implemented User Badge Management Interface

  1. Implemented rule to verify if a user badge already exists before insert (models/user/badge.go).
  2. Implemented interface to manage user badge, within administration panel. (routers/web/web.go) (routers/web/explore/badge.go) (routers/web/admin/badges.go) (templates/admin/badge/users.tmpl).
  3. Small bug fixes (view.tmpl, list.tmpl)
  4. Added new translation phrases: admin.badges.users_with_badge, admin.badges.add_user, admin.badges.remove_user, admin.badges.delete_user_desc, admin.badges.not_found, admin.badges.user_add_success, admin.badges.user_remove_success, admin.badges.manage_users.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jun 5, 2024
@github-actions github-actions bot added modifies/translation modifies/go Pull requests that update Go code modifies/templates This PR modifies the template files labels Jun 5, 2024
@HenriquerPimentel HenriquerPimentel marked this pull request as draft June 5, 2024 14:10
@HenriquerPimentel HenriquerPimentel marked this pull request as ready for review June 14, 2024 12:00
@lunny lunny added this to the 1.23.0 milestone Jun 14, 2024
techknowlogick
techknowlogick reviewed Jun 14, 2024
View reviewed changes
Copy link
Member

@techknowlogick techknowlogick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR! The CI has a few linting reports that came up that I've reported in line :)

@HenriquerPimentel
Copy link
Contributor Author

Thanks for the PR! The CI has a few linting reports that came up that I've reported in line :)

Thank you so much!

HenriquerPimentel and others added 3 commits June 19, 2024 13:53
@HenriquerPimentel
Implemented Badge Management in administration panel (go-gitea#29798)
8b86c31 
Co-authored-by: Diogo Vicente <diogo.m.s.vicente@tecnico.ulisboa.pt>
@HenriquerPimentel
Implemented User Badge Management Interface (go-gitea#29798)
f68e44d 
Co-authored-by: Diogo Vicente <diogo.m.s.vicente@tecnico.ulisboa.pt>
@HenriquerPimentel
Fix linting recommendations
d681313
techknowlogick
techknowlogick reviewed Jun 19, 2024
View reviewed changes
@techknowlogick
Copy link
Member

@HenriquerPimentel looks like some different CI steps are failing, also related to linting (some public go functions require comments to document their purpose, eg AdminCreateBadge), although with AdminCreateBadge as it is a wrapper for another function without any transformative properties or checks that one could probably be kept as just CreateBadge without the secondary function.

As a sidenote: force pushing erases some review history as GitHub sees some files as new (even if they remain the same). If you could reduce your force pushes, it'd be helpful to me as a reviewer so I can keep track of what I've seen already
disclaimer: most of the time we try to discourage force pushing to PRs for this reason, although depending on the reviewer of a certain PR they can "call an audible" depending on the situation and might be ok with it.

lunny
lunny reviewed Sep 26, 2024
View reviewed changes
lunny
lunny reviewed Sep 26, 2024
View reviewed changes
lunny
lunny reviewed Sep 26, 2024
View reviewed changes
@lunny lunny changed the title Manage User Badges in the interface #29798 Manage User Badges in the UI Jan 16, 2025
@techknowlogick
Copy link
Member

@lunny any additional feedback?

lunny
lunny reviewed Jan 22, 2025
View reviewed changes
lunny
lunny reviewed Jan 22, 2025
View reviewed changes
@lunny
Copy link
Member

lunny commented Jan 22, 2025

When creating a badge with only slug, it reports 500.
image

wxiaoguang
wxiaoguang reviewed Jan 23, 2025
View reviewed changes
wxiaoguang
wxiaoguang reviewed Jan 23, 2025
View reviewed changes
wxiaoguang
wxiaoguang reviewed Jan 23, 2025
View reviewed changes
wxiaoguang
wxiaoguang reviewed Jan 23, 2025
View reviewed changes
wxiaoguang
wxiaoguang reviewed Jan 23, 2025
View reviewed changes
wxiaoguang
wxiaoguang reviewed Jan 23, 2025
View reviewed changes
@wxiaoguang wxiaoguang marked this pull request as draft March 8, 2025 16:48
@komarov komarov mentioned this pull request Apr 2, 2025
Merged
@lunny lunny modified the milestones: 1.24.0, 1.25.0 Apr 10, 2025
@techknowlogick techknowlogick marked this pull request as ready for review July 21, 2025 15:45
@techknowlogick
Copy link
Member

@lunny @wxiaoguang thanks for your feedback. I've updated this PR per your reviews.

I also cherry-picked changes from #33950 by @komarov (I set you as the commit author, but the GUI only shows that in one specific place, as it has me as the "committer". GH has you as a co-author in the commit trailing bits for when this PR is squashed/merged)

lunny
lunny reviewed Jul 21, 2025
View reviewed changes
models/user/badge.go
@@ -25,6 +30,59 @@ type UserBadge struct { //nolint:revive // export stutter
UserID int64 `xorm:"INDEX"`
}

// TableIndices implements xorm's TableIndices interface
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So that please remove the index tags in the struct

lunny
lunny reviewed Jul 21, 2025
View reviewed changes
models/migrations/v1_25/v321.go

// AddUniqueIndexForUserBadge adds a compound unique indexes for user badge table
// and it replaces an old index on user_id
func AddUniqueIndexForUserBadge(x *xorm.Engine) error {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's better to add a test for the function.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lunny lunny lunny left review comments

@techknowlogick techknowlogick techknowlogick left review comments

@wxiaoguang wxiaoguang wxiaoguang left review comments

Assignees
No one assigned
Labels
lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. modifies/go Pull requests that update Go code modifies/migrations modifies/templates This PR modifies the template files modifies/translation
Projects
None yet
Milestone
1.25.0
Development

Successfully merging this pull request may close these issues.
5 participants
@HenriquerPimentel @techknowlogick @lunny @wxiaoguang @GiteaBot