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

Org referents #2697

Merged
merged 8 commits into from
Sep 2, 2019
Merged

Org referents #2697

merged 8 commits into from
Sep 2, 2019

Conversation

RemiDesgrange
Copy link
Contributor

@RemiDesgrange RemiDesgrange commented Aug 26, 2019

Add the ability for a user with the role REFERENT to edit some of the field of his organization. REFERENT role is now a protected role in georchestra. This PR contain the frontend and the bacend implementation.

@RemiDesgrange RemiDesgrange marked this pull request as ready for review August 27, 2019 14:43
@RemiDesgrange RemiDesgrange force-pushed the org-referents branch 2 times, most recently from 61e0bff to 2a82c83 Compare August 27, 2019 14:48
Copy link
Member

@groldan groldan left a comment

Choose a reason for hiding this comment

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

Hi Remi, I've rebased on top of master for you since it was my fault to commit the code formatting with the wrong formatter.xml file.
Please do:

git remote add groldan git@github.com:groldan/georchestra.git
git fetch groldan
git reset --hard groldan/org-referents

Before continuing with the requested changes, which btw are rather minimal, PR looks good overal.

@@ -29,6 +29,13 @@ editUserDetailsForm.organisation=Organization
editUserDetailsForm.url=Website
editUserDetailsForm.areaOfCompetence=Area of competence
editUserDetailsForm.members=Members
editUserDetailsForm.editOrg=Edit Organization
Copy link
Member

Choose a reason for hiding this comment

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

The PR should also update the other translation files.

Copy link
Member

Choose a reason for hiding this comment

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

I'm doing it :-(

@fvanderbiest fvanderbiest merged commit 79bcfe6 into master Sep 2, 2019
@fvanderbiest fvanderbiest deleted the org-referents branch September 2, 2019 12:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants