Skip to content
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

User details page #26713

Merged
merged 12 commits into from
Aug 31, 2023
Merged

User details page #26713

merged 12 commits into from
Aug 31, 2023

Conversation

denyskon
Copy link
Member

@denyskon denyskon commented Aug 24, 2023 •
edited
Loading

This PR implements a proposal to clean up the admin users table by moving some information out to a separate user details page (which also displays some additional information).

Other changes:

  • move edit user page from /admin/users/{id} to /admin/users/{id}/edit -> /admin/users/{id} now shows the user details page
  • show if user is instance administrator as a label instead of a separate column
  • separate explore users template into a page- and a shared one, to make it possible to use it on the user details page
  • fix issue where there was no margin between alert message and following content on admin pages
Screenshots

grafik

grafik

Partially resolves #25939

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Aug 24, 2023
@pull-request-size pull-request-size bot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Aug 24, 2023
@denyskon denyskon added the type/feature Completely new functionality. Can only be merged if feature freeze is not active. label Aug 24, 2023
@denyskon denyskon added this to the 1.21.0 milestone Aug 24, 2023
@denyskon denyskon added type/changelog Adds the changelog for a new Gitea version and removed type/changelog Adds the changelog for a new Gitea version labels Aug 24, 2023
@denyskon
Copy link
Member Author

Btw, feel free to suggest other things that should be showed on this page :)

silverwind
silverwind reviewed Aug 25, 2023
View reviewed changes
web_src/css/admin.css Outdated Show resolved Hide resolved
delvh
delvh approved these changes Aug 30, 2023
View reviewed changes
Copy link
Member

@delvh delvh left a comment

Choose a reason for hiding this comment

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

Code looks fine.
Only one small nit regarding the display:
The user link looks like it would redirect to the user profile, not to an info page about them.
Perhaps we should add an information icoin or something like that behind it to signify that you should click on the link, that it isn't just "decorative".
But that's not too urgent, we can still add that afterwards.

@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Aug 30, 2023
wxiaoguang
wxiaoguang reviewed Aug 30, 2023
View reviewed changes
templates/admin/user/view_details.tmpl Outdated Show resolved Hide resolved
templates/admin/user/view_details.tmpl Outdated Show resolved Hide resolved
templates/explore/user_list.tmpl Outdated Show resolved Hide resolved
web_src/css/admin.css Outdated Show resolved Hide resolved
@denyskon
Copy link
Member Author

@wxiaoguang all done :)

@delvh I'll maybe do it in a follow-up PR later at some point. I'm really sick currently and barely managed to apply wxiaoguang's suggestions :/

@GiteaBot GiteaBot removed the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Aug 31, 2023
@GiteaBot GiteaBot added the lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. label Aug 31, 2023
@denyskon denyskon added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Aug 31, 2023
@silverwind silverwind merged commit 5b5bb8d into go-gitea:main Aug 31, 2023
23 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Aug 31, 2023
@denyskon denyskon deleted the feat/user-details-page branch August 31, 2023 09:28
zjjhot added a commit to zjjhot/gitea that referenced this pull request Sep 1, 2023
@zjjhot
Merge remote-tracking branch 'giteaoffical/main'
92a4a33 
* giteaoffical/main: (22 commits)
  Use case-insensitive regex for all webpack assets (go-gitea#26867)
  restrict certificate type for builtin SSH server (go-gitea#26789)
  feat(API): add secret deletion functionality for repository (go-gitea#26808)
  Avoid double-unescaping of form value (go-gitea#26853)
  Move web/api context related testing function into a separate package (go-gitea#26859)
  Remove some unused CSS styles (go-gitea#26852)
  [skip ci] Updated translations via Crowdin
  Minor dashboard tweaks, fix flex-list margins (go-gitea#26829)
  Update team invitation email link (go-gitea#26550)
  Redirect from `{repo}/issues/new` to `{repo}/issues/new/choose` when blank issues are disabled (go-gitea#26813)
  Remove "TODO" tasks from CSS file (go-gitea#26835)
  User details page (go-gitea#26713)
  Render code blocks in repo description (go-gitea#26830)
  Remove joinPaths function (go-gitea#26833)
  Remove polluted `.ui.right` (go-gitea#26825)
  Sync tags when adopting repos (go-gitea#26816)
  rm comment about hugo (go-gitea#26832)
  Fix filename for .spectral.yaml (go-gitea#26828)
  [skip ci] Updated translations via Crowdin
  Check blocklist for emails when adding them to account (go-gitea#26812)
  ...
@denyskon denyskon mentioned this pull request Sep 10, 2023
Merged
@CaiCandong CaiCandong mentioned this pull request Sep 11, 2023
Merged
delvh pushed a commit that referenced this pull request Sep 18, 2023
@CaiCandong
Fix the incorrect route path in the user edit page. (#27007)
323135b 
Regression of #26713

After #26713 , the base path of user edit has been changed to
`/admin/users/{userid}/edit`
## Before

https://github.com/go-gitea/gitea/assets/50507092/5f4a3f64-fe2b-4499-b110-e01c9d87ea19
lunny pushed a commit that referenced this pull request Oct 1, 2023
@denyskon @silverwind
highlight user details link (#26998)
4ab597f 
This PR adds a separated column in the users table for operations. The
username link now redirects back to user page.


![grafik](https://github.com/go-gitea/gitea/assets/47871822/df8c8b30-3da6-443c-ae0f-6e3cac7dd9bb)

Resolves
#26713 (review)

Co-authored-by: silverwind <[email protected]>
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Oct 1, 2023
@denyskon @silverwind @GiteaBot
highlight user details link (go-gitea#26998)
26b0d70 
This PR adds a separated column in the users table for operations. The
username link now redirects back to user page.


![grafik](https://github.com/go-gitea/gitea/assets/47871822/df8c8b30-3da6-443c-ae0f-6e3cac7dd9bb)

Resolves
go-gitea#26713 (review)

Co-authored-by: silverwind <[email protected]>
@GiteaBot GiteaBot mentioned this pull request Oct 1, 2023
Merged
6543 pushed a commit that referenced this pull request Oct 1, 2023
@GiteaBot @denyskon @silverwind
highlight user details link (#26998) (#27376)
eea79ce 
Backport #26998 by @denyskon

This PR adds a separated column in the users table for operations. The
username link now redirects back to user page.


![grafik](https://github.com/go-gitea/gitea/assets/47871822/df8c8b30-3da6-443c-ae0f-6e3cac7dd9bb)

Resolves
#26713 (review)

Co-authored-by: silverwind <[email protected]>

Co-authored-by: Denys Konovalov <[email protected]>
Co-authored-by: silverwind <[email protected]>
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Nov 29, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@puni9869 puni9869 puni9869 left review comments

@silverwind silverwind silverwind left review comments

@delvh delvh delvh approved these changes

@wxiaoguang wxiaoguang wxiaoguang approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/feature Completely new functionality. Can only be merged if feature freeze is not active.
Projects
None yet
Milestone
1.21.0
Development

Successfully merging this pull request may close these issues.

Not readable style
6 participants
@denyskon @silverwind @wxiaoguang @delvh @puni9869 @GiteaBot