Skip to content

Add org visibility label to non-organization's dashboard #24558

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

Merged
merged 14 commits into from
May 7, 2023
Merged

Add org visibility label to non-organization's dashboard #24558

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2b2ed85
add org visibility to dashboard
HesterG May 6, 2023
e6eec9b
change variable name
HesterG May 6, 2023
12d45dd
modify styles
HesterG May 6, 2023
dd4fc93
remove unnecessary CSS/style
wxiaoguang May 6, 2023
b77b9e3
Merge branch 'main' into add-org-visibility-dashboard
HesterG May 6, 2023
5207ef4
Merge branch 'main' into add-org-visibility-dashboard
GiteaBot May 6, 2023
e905193
Merge branch 'main' into add-org-visibility-dashboard
GiteaBot May 6, 2023
42d69a6
Merge branch 'main' into add-org-visibility-dashboard
GiteaBot May 6, 2023
5fbdf7c
Merge branch 'main' into add-org-visibility-dashboard
GiteaBot May 6, 2023
407c059
fix lint
wxiaoguang May 6, 2023
8e4309e
Merge branch 'main' into add-org-visibility-dashboard
GiteaBot May 6, 2023
ef251a0
Merge branch 'main' into add-org-visibility-dashboard
GiteaBot May 6, 2023
9e3f4a6
Merge branch 'main' into add-org-visibility-dashboard
GiteaBot May 6, 2023
95ae598
Merge branch 'main' into add-org-visibility-dashboard
GiteaBot May 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion templates/user/dashboard/repolist.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,17 @@ const data = {
textMyOrgs: {{.locale.Tr "home.my_orgs"}},
textNewOrg: {{.locale.Tr "new_org"}},
textOrgVisibilityLimited: {{.locale.Tr "org.settings.visibility.limited_shortname"}},
textOrgVisibilityPrivate: {{.locale.Tr "org.settings.visibility.private_shortname"}},
};
{{if .Team}}
data.teamId = {{.Team.ID}};
{{end}}
{{if not .ContextUser.IsOrganization}}
data.organizations = [{{range .Orgs}}{'name': {{.Name}}, 'num_repos': {{.NumRepos}}},{{end}}];
data.organizations = [{{range .Orgs}}{'name': {{.Name}}, 'num_repos': {{.NumRepos}}, 'org_visibility': {{.Visibility}}},{{end}}];
data.isOrganization = false;
data.organizationsTotalCount = {{.UserOrgsCount}};
data.canCreateOrganization = {{.SignedUser.CanCreateOrganization}};
Expand Down
3 changes: 2 additions & 1 deletion web_src/css/dashboard.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,8 @@
padding-right: 0.5rem;
}

.dashboard .dashboard-navbar .org-visibility .label {
.dashboard .dashboard-navbar .org-visibility .label,
.dashboard .repo-owner-name-list .org-visibility .label {
margin-left: 5px;
}

Expand Down
3 changes: 3 additions & 0 deletions web_src/js/components/DashboardRepoList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@
<div class="text truncate item-name gt-f1">
<svg-icon name="octicon-organization" :size="16" class-name="gt-mr-2"/>
<strong>{{ org.name }}</strong>
<span class="org-visibility" v-if="org.org_visibility !== 'public'">
<div class="ui medium basic horizontal label">{{org.org_visibility === 'limited' ? textOrgVisibilityLimited: textOrgVisibilityPrivate}}</div>
</span>
</div>
<div class="text light grey gt-df gt-ac">
{{ org.num_repos }}
Expand Down