Since individual users and organizations use the same.profile repository name forREADME.md, adding the private one, I rename the contexts withPublic andPrivate inside them.
I wanted to load the private profile the same as GitHub, which uses theview_as query parameter. Still, the existing query scheme is quite limited due to the integration with the search form and the repository paginator, so my workaround is to forcefully bring augmented query strings of member/public to the tmpl file.
The drop-down is adopted from the search box's sort by component, we need to discuss the stylings.

Things lack and need further guidance (update: all done)

At the create repository page, the ideal user experience is when the repo name is entered.profile themake repository private checkbox should be disabled and stay unchecked, whereas.profile-private, the checkbox should be disabled and force checked.
Follow 1., Tool tips should be added.
The translation and CSS for the current drop box and view as public/member feature.

Screenshots:

GiteaBot added the lgtm/need 2This PR needs two approvals by maintainers to be considered for merging. label

Dec 17, 2024

pull-request-sizebot added the size/M label

Dec 17, 2024

github-actionsbot added modifies/go

Pull requests that update Go code

modifies/templatesThis PR modifies the template files labels

Dec 17, 2024

changchaishi mentioned this pull request

Dec 17, 2024

Support a member-only organisation profile README#29503

Closed

wxiaoguang reviewed

Dec 22, 2024

View reviewed changes

templates/org/home.tmpl OutdatedShow resolvedHide resolved

changchaishi force-pushed theprivate-readme branch from54593db to55af509Compare

December 23, 2024 04:10

pull-request-sizebot added size/L and removed size/M labels

Dec 23, 2024

github-actionsbot added modifies/translation modifies/frontend labels

Dec 23, 2024

changchaishi marked this pull request as draft

December 23, 2024 06:02

Copy link

ContributorAuthor

changchaishi commentedDec 23, 2024•
edited by wxiaoguang
Loading

Hi, I listed the behaviors that this PR implemented as below:

hints to create.profile and.profile-private repos (if users do not follow the hint, profile may not show)

Details

view_as drop down only shows when the user is member in organization and both public and member profiles exist

Details

If there is no profile repo, not showingoverview tab

Details

When user is a member of org and logged in, and only 1 profile is present, show that profile

Details

When user is not logged in, or not a member, only public profile will show if it is present

Details

changchaishi marked this pull request as ready for review

December 23, 2024 06:10

Copy link

Contributor

wxiaoguang commentedDec 23, 2024

Could you add some tests intests/integration/org_*.go to verify the "view as public" and "view as member" outputs?

If I understand correctly: view as public: private repositories won't be listed.

Copy link

ContributorAuthor

changchaishi commentedDec 27, 2024

If I understand correctly: view as public: private repositories won't be listed.

In this designview as is only to select profiles. The permission system decides whether the doer can access the README.md. Nothing has changed.

So viewing as public does not mean that a member user will not see private repos listed if he/she already has permission.

Copy link

Contributor

wxiaoguang commentedDec 27, 2024•
edited
Loading

If I understand correctly: view as public: private repositories won't be listed.
In this designview as is only to select profiles. The permission system decides whether the doer can access the README.md. Nothing has changed.

Maybe GitHub also changed their behavior:You are viewing the README and **pinned** repositories as a public user. vsYou are viewing the README and repositories as a public user. I wouldn't say it is good but it doesn't block since GitHub does so.

While I still think it needs to add some tests intests/integration/org_*.go to verify the "view as public" and "view as member" outputs, to cover the new code's behavior.

Copy link

ContributorAuthor

changchaishi commentedDec 27, 2024

While I still think it needs to add some tests intests/integration/org_*.go to verify the "view as public" and "view as member" outputs, to cover the new code's behavior.

I'm working on it. Trying to get familiar with the integration tests.

Ben Changand others added9 commits

December 29, 2024 02:54

Use view as to get public and private profile repo

784bedd

make query string right

3682adb

make sure the drop down appears only when criteria are met

ef826a1

Add hint for public and private profile repo name

6496b3c

fix that drop down manu shows in repository tab

4b3a8ac

add check icons and translation

d71cba7

add rollback to get private profile when view as is not present

86e698d

Ignore view_as param when the profiles not both exist

e95d716

adding profile test case

48b4be2

changchaishi force-pushed theprivate-readme branch from4347353 to48b4be2Compare

December 28, 2024 18:54

lunny added this to the1.24.0 milestone

Dec 29, 2024

lunny reviewed

Dec 29, 2024

View reviewed changes

templates/repo/create.tmpl OutdatedShow resolvedHide resolved

wxiaoguang marked this pull request as ready for review

December 30, 2024 15:25

Copy link

Member

lunny commentedDec 31, 2024

Looks like the dropdown is not in the right place.

Copy link

Contributor

wxiaoguang commentedDec 31, 2024

Looks like the dropdown is not in the right place.

It is#32872 (comment) :

I think we need to move the view-as dropdown to the sidebar (just like GitHub) then we could have more spaces for hints and we could add more features to it in the future.

wxiaoguang added3 commits

December 31, 2024 09:51

auto toggle "private" checkbox by repo name

c1ae1ad

make "view as" translatable

95312c7

fine tune "view as"

bc5718d

wxiaoguang requested review fromlunny andwxiaoguang

December 31, 2024 02:09

GiteaBot added lgtm/need 2This PR needs two approvals by maintainers to be considered for merging. and removed lgtm/need 1This PR needs approval from one additional maintainer to be merged. labels

Dec 31, 2024

wxiaoguang approved these changes

Dec 31, 2024

View reviewed changes

GiteaBot added lgtm/need 1This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2This PR needs two approvals by maintainers to be considered for merging. labels

Dec 31, 2024

wxiaoguang mentioned this pull request

Dec 31, 2024

WIP: Add profile wiki to org home#32947

Closed

lunny approved these changes

Dec 31, 2024

View reviewed changes

GiteaBot added lgtm/doneThis PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1This PR needs approval from one additional maintainer to be merged. labels

Dec 31, 2024

Merge branch 'main' into private-readme

2c0e19d

wxiaoguangenabled auto-merge (squash)

December 31, 2024 03:58

wxiaoguang added the reviewed/wait-mergeThis pull request is part of the merge queue. It will be merged soon. label

Dec 31, 2024

wxiaoguang merged commit0387195 intogo-gitea:main

Dec 31, 2024

26 checks passed

GiteaBot removed the reviewed/wait-mergeThis pull request is part of the merge queue. It will be merged soon. label

Dec 31, 2024

Copy link

Contributor

wxiaoguang commentedDec 31, 2024

Then we can add "org profile wiki" link easily: Add profile wiki to org home#32947

wxiaoguang mentioned this pull request

Dec 31, 2024

Fix locale typo#33059

Merged

changchaishi deleted the private-readme branch

December 31, 2024 06:09

wxiaoguang added a commit that referenced this pull request

Dec 31, 2024

Fix locale type (#33059)

58c092c

Follow#32872

lunny mentioned this pull request

Dec 31, 2024

Cannot select "Initialize Repository" when creating a repo#33060

Closed

zjjhot added a commit to zjjhot/gitea that referenced this pull request

Jan 2, 2025

Merge remote-tracking branch 'giteaofficial/main'

9754baf

* giteaofficial/main:  [skip ci] Updated translations via Crowdin  unset XDG_HOME_CONFIG as gitea manages configuration locations (go-gitea#33067)  Refactor repo-new.ts (go-gitea#33070)  Refactor pull-request compare&create page (go-gitea#33071)  feat: link to nuget dependencies (go-gitea#26554)  Remove some unnecessary template helpers (go-gitea#33069)  Inherit submodules from template repository content (go-gitea#16237)  [skip ci] Updated translations via Crowdin  feat(action): issue change title notifications (go-gitea#33050)  Use project's redirect url instead of composing url (go-gitea#33058)  Fix unittest and repo create bug (go-gitea#33061)  Fix locale type (go-gitea#33059)  Refactor maven package registry (go-gitea#33049)  Optimize the installation page (go-gitea#32994)  [Feature] Private README.md for organization (go-gitea#32872)  Make issue suggestion work for new PR page (go-gitea#33035)  Add IntelliJ Gateway's .uuid to gitignore (go-gitea#33052)