-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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
[stable10] Store quota overrides in preferences table #34467
Conversation
05ef048
to
fd9df26
Compare
@pako81 This should solve issues with overriting quotas on sync. |
@tomneedham hmm but wouldn't this code here also overwrite any value that was set by an admin as the override value during the next sync ? |
No. Sync sets on the account. https://github.com/owncloud/core/blob/master/lib/private/User/SyncService.php#L223 SyncSerice is the connector between the Account and the User Backend. This convenince method is only used by the provisioning api and the UI to override the user quota that is provided by the user backend. |
Right, I see. So you brought back something we deleted back then. |
I agree with the change, let's see what CI says. I hope we do have some coverage here |
Codecov Report
@@ Coverage Diff @@
## stable10 #34467 +/- ##
==============================================
+ Coverage 63.57% 63.57% +<.01%
Complexity 19146 19146
==============================================
Files 1265 1265
Lines 75314 75315 +1
Branches 1291 1291
==============================================
+ Hits 47884 47885 +1
Misses 27050 27050
Partials 380 380
Continue to review full report at Codecov.
|
1 similar comment
Codecov Report
@@ Coverage Diff @@
## stable10 #34467 +/- ##
==============================================
+ Coverage 63.57% 63.57% +<.01%
Complexity 19146 19146
==============================================
Files 1265 1265
Lines 75314 75315 +1
Branches 1291 1291
==============================================
+ Hits 47884 47885 +1
Misses 27050 27050
Partials 380 380
Continue to review full report at Codecov.
|
@individual-it @phil-davis as we have some work regarding LDAP automated tests, we should include something to cover this override |
@PVince81 @tomneedham looks like testing this was thought about recently: owncloud/user_ldap#368 |
ok let's cover that with LDAP then, merging |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
master: #34511 |
@pmaier1 |
Description
Currently the user management UI in stable10 uses this method, through
setquota.php
to update the quota of a user. However, if they are from another user backend, on sync the quota is just replaced.New version of #32731
Setting the quota override should set it in the preferences table as well which is used as the manual override. On sync, the sync serivce checks this and uses this as an override instead. You can delete the key here to go back to the one supplied by the user backend.
Related Issue
#32731
Motivation and Context
Quota is replaced on every sync if you override the quota in owncloud 10 and use an external user backend.
How Has This Been Tested?
Manually in the UI.
Types of changes
Checklist:
Open tasks: