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

remove PHP generated user list and move all to the existing JS part #12790

Merged
merged 3 commits into from
Dec 12, 2014

Conversation

MorrisJobke
Copy link
Contributor

I cleaned up the PHP part of the user management. The whole user list is now generated via the existing JS code.

  • moved loading of JS and CSS to template

ref #12620

@blizzz @LukasReschke @PVince81 Give this a try and report back problems.

TODO:

  • changing groups cause problems with the group drop down

@ghost
Copy link

ghost commented Dec 11, 2014

Refer to this link for build results (access rights to CI server needed):
https://ci.owncloud.org//job/pull-request-analyser-ng-simple/4316/
🚀 Test PASSed. 🚀

@LukasReschke
Copy link
Member

When switching groups multiple times on the left the group boxes are mixed up:

screen shot 2014-12-11 at 21 27 15

Otherwise: works fine 👍

@MorrisJobke
Copy link
Contributor Author

@LukasReschke But then it's an issue that exists before. Because this just needs to fill the list the first time and then just relies on the (also previously used) JS code

@LukasReschke
Copy link
Member

@MorrisJobke Works fine on master for me.

@MorrisJobke
Copy link
Contributor Author

Reproducable here too. Will fix this tomorrow.

@MorrisJobke
Copy link
Contributor Author

@LukasReschke I fixed the problem ;)

@MorrisJobke
Copy link
Contributor Author

I just changed the JS and they run successful local. This is ready for merge

@scrutinizer-notifier
Copy link

The inspection completed: 5 new issues

@ghost
Copy link

ghost commented Dec 12, 2014

Refer to this link for build results (access rights to CI server needed):
https://ci.owncloud.org//job/pull-request-analyser-ng-simple/4364/

Build result: FAILURE

[...truncated 16 lines...]Fetching upstream changes from https://github.com/owncloud/core.gitusing GIT_SSH to set credentials using .gitcredentials to set credentials > git config --local credential.helper store --file=/tmp/git4636580237226817205.credentials # timeout=10 > git fetch --tags --progress https://github.com/owncloud/core.git +refs/pull/:refs/remotes/origin/pr/ > git config --local --remove-section credential # timeout=10 > git rev-parse origin/pr/12790/merge^{commit} # timeout=10 > git branch -a --contains 15045c783221a3c88e06a03a89ca304758c779c6 # timeout=10 > git rev-parse remotes/origin/pr/12790/merge^{commit} # timeout=10Checking out Revision 15045c783221a3c88e06a03a89ca304758c779c6 (origin/pr/12790/merge) > git config core.sparsecheckout # timeout=10 > git checkout -f 15045c783221a3c88e06a03a89ca304758c779c6First time build. Skipping changelog. > git remote # timeout=10 > git submodule init # timeout=10 > git submodule sync # timeout=10 > git config --get remote.origin.url # timeout=10 > git submodule update --init --recursiveTriggering pull-request-analyser-ng-simple » SLAVEpull-request-analyser-ng-simple » SLAVE completed with result FAILUREStarted calculate disk usage of buildFinished Calculation of disk usage of build in 0 secondsStarted calculate disk usage of workspaceFinished Calculation of disk usage of workspace in 1 second
💣 Test FAILed. 💣

@LukasReschke
Copy link
Member

👍

@nickvergessen
Copy link
Contributor

👍 failing test is unrelated

MorrisJobke added a commit that referenced this pull request Dec 12, 2014
remove PHP generated user list and move all to the existing JS part
@MorrisJobke MorrisJobke merged commit c451d99 into master Dec 12, 2014
@MorrisJobke MorrisJobke deleted the user-mngt-js-only branch December 12, 2014 10:32
@MorrisJobke MorrisJobke mentioned this pull request Dec 22, 2014
27 tasks
@lock lock bot locked as resolved and limited conversation to collaborators Aug 15, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants