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.

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

Display all organization from user settings #1739

Merged
merged 7 commits into from
Jun 2, 2017

Conversation

DblK
Copy link
Member

@DblK DblK commented May 17, 2017

This PR implement the display of all organizations that the current member is in.

Here are the UI modifications:

image

image

image

Feel free to comment. This is a port of a PR I made for gogs.

@DblK
Copy link
Member Author

DblK commented May 17, 2017

New UI with the last commit:

image

@tboerger tboerger added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 17, 2017
@lunny lunny added the type/feature Completely new functionality. Can only be merged if feature freeze is not active. label May 17, 2017
@lunny lunny added this to the 1.3.0 milestone May 17, 2017
@appleboy
Copy link
Member

LGTM

@tboerger tboerger 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 May 17, 2017
@pgaskin
Copy link
Contributor

pgaskin commented May 17, 2017

LGTM, but I have not tried building this yet.

@tboerger tboerger added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels May 17, 2017
@lunny
Copy link
Member

lunny commented May 18, 2017

Since it's a new feature, please merge this after v1.2 released

{{template "base/alert" .}}
<h4 class="ui top attached header">
{{.i18n.Tr "settings.orgs"}}
<div class="ui right">
Copy link
Member

Choose a reason for hiding this comment

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

I think there should be if to check if user has rights to create organizations

Copy link
Member Author

Choose a reason for hiding this comment

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

True, I will make a new commit for that.

@bkcsoft bkcsoft added the status/blocked This PR cannot be merged yet, i.e. because it depends on another unmerged PR label May 20, 2017
@@ -274,6 +274,7 @@ applications=Applications
orgs=Organisations
delete=Supprimer le compte
twofa=Authentification à deux facteurs
organization = Organisation
Copy link
Member

Choose a reason for hiding this comment

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

Only translate English :)

Copy link
Member Author

Choose a reason for hiding this comment

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

I removed french translation

func SettingsOrganization(ctx *context.Context) {
ctx.Data["Title"] = ctx.Tr("settings")
ctx.Data["PageIsSettingsOrganization"] = true
orgs, err := models.GetOrgsByUserID(ctx.User.ID, ctx.IsSigned && ctx.User.IsAdmin)
Copy link
Member

Choose a reason for hiding this comment

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

Why ctx.User.IsAdmin ?

Copy link
Member Author

Choose a reason for hiding this comment

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

My mistake, it should not be here. I pushed a new commit.

@bkcsoft
Copy link
Member

bkcsoft commented May 21, 2017

Other than my question, looks good. Why the New Orga-button though? It's already in the +-menu in the NavBar 😕

@DblK
Copy link
Member Author

DblK commented May 22, 2017

For my point of view, it's faster to create that way.
If I'm looking at the least with only one click I can create a new one, instead of two :p
Maybe I am too lazy ;)

@bkcsoft
Copy link
Member

bkcsoft commented Jun 1, 2017

@DblK Builds fail, other than that we should be ready to merge :)

@DblK
Copy link
Member Author

DblK commented Jun 1, 2017

Thanks for the review. Build failed because of time limit exceeded. Could you restart it?

@sapk
Copy link
Member

sapk commented Jun 2, 2017

@DblK you can also commit --amend or rebase to restart a build.

@appleboy appleboy merged commit 62f600c into go-gitea:master Jun 2, 2017
@appleboy
Copy link
Member

appleboy commented Jun 2, 2017

@lunny Sorry for merged this PR in 1.2.0 milestone.

@appleboy appleboy modified the milestones: 1.2.0, 1.3.0 Jun 2, 2017
@lunny lunny removed the status/blocked This PR cannot be merged yet, i.e. because it depends on another unmerged PR label Jun 2, 2017
@go-gitea go-gitea locked and limited conversation to collaborators Nov 23, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/feature Completely new functionality. Can only be merged if feature freeze is not active.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants