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

Add Edit User permission to permissions grid #1859

Merged
merged 3 commits into from
Sep 3, 2019
Merged

Add Edit User permission to permissions grid #1859

merged 3 commits into from
Sep 3, 2019

Conversation

tankerkiller125
Copy link
Contributor

Fixes #1845

Changes proposed in this pull request:
This change adds the User Edit permission to the permissions panel in the administration view

Reviewers should focus on:
General code, this is my first pull request for Flarum, the lang-eng repo will also have a pull request that adds the translation for the label

Screenshot

Annotation 2019-08-24 210709

Confirmed

  • Frontend changes: tested on a local Flarum installation.
  • Backend changes: tests are green (run php vendor/bin/phpunit).

Required changes:

@vingrad
Copy link

vingrad commented Aug 25, 2019

Thanks for you contributing, but please do not commit the files in the dist directory.

Flarum's front-end code is written in ES6 and transpiled into JavaScript. During development you will need to recompile the JavaScript using Node.js. Please do not commit the resulting dist files when sending PRs; this is automatically taken care of when changes are merged into the master branch.
Reference: https://flarum.org/docs/contributing.html#development-setup

@tankerkiller125
Copy link
Contributor Author

I've undone the commit and force pushed a new one that only contains the src changes, no dist files are included with the change now.

@franzliedke
Copy link
Contributor

Code looks good, but let's not merge this until the discussion in #1845 has been resolved.

@franzliedke
Copy link
Contributor

I am closing this for now, until we have reached a decision in #1845.

@tankerkiller125 Thanks a lot for your contribution! If we decide to move forward with this, we will surely reactivate this. I am just trying to keep the number of open PRs down. I hope you understand. 😉 Have a great weekend!

@franzliedke franzliedke reopened this Sep 3, 2019
@franzliedke franzliedke merged commit 4df455c into flarum:master Sep 3, 2019
@franzliedke
Copy link
Contributor

@tankerkiller125 Thanks and congrats!

wzdiyb pushed a commit to wzdiyb/core that referenced this pull request Feb 16, 2020
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.

Missing control for permission user.edit in the admin
3 participants