Only accept folder setup page if overrideLocalDir is set #5385
Conversation
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## master #5385 +/- ##
==========================================
+ Coverage 57.98% 58.01% +0.02%
==========================================
Files 141 141
Lines 18113 18113
==========================================
+ Hits 10503 10508 +5
+ Misses 7610 7605 -5
|
camilasan
force-pushed
the
bugfix/issue-5383
branch
from
1865044 to
c758cf8
Compare
| { | ||
| // these config values will always be empty after the first client run | ||
| if (!_overrideServerUrl.isEmpty()) { | ||
| cfg.setOverrideServerUrl(_overrideServerUrl); | ||
| } | ||
|
|
||
| if (!_overrideLocalDir.isEmpty()) { | ||
| cfg.setOverrideLocalDir(_overrideLocalDir); | ||
| } | ||
| } |
There was a problem hiding this comment.
No variable declarations here, so I would say it makes sense to remove the block and make it inline with the rest of the method
If the intention here is to make it clear this is a specific procedure relating to override values, I would instead move it into a separate private static method which would make this even more readable
Fix for #5383. Signed-off-by: Camila <hello@camila.codes>
Signed-off-by: Camila <hello@camila.codes>
When the client runs for the first time, setting the value was done before the config file was created. It had no effect. Signed-off-by: Camila <hello@camila.codes>
Signed-off-by: Camila <hello@camila.codes>
mgallien
force-pushed
the
bugfix/issue-5383
branch
from
c758cf8 to
e533c60
Compare
|
/backport to stable-3.6 |
|
/backport to stable-3.7 |
|
The backport to stable-3.6 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable-3.6
git pull origin/stable-3.6
# Create the new backport branch
git checkout -b fix/foo-stable-3.6
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable-3.6More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
|
The backport to stable-3.7 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable-3.7
git pull origin/stable-3.7
# Create the new backport branch
git checkout -b fix/foo-stable-3.7
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable-3.7More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
|
/backport to stable-3.7 |
|
AppImage file: nextcloud-PR-5385-e533c6047c02cc717e77f1dd2af26217313ac459-x86_64.AppImage |
|
The backport to stable-3.7 failed. Please do this backport manually. # Switch to the target branch and update it
git checkout stable-3.7
git pull origin/stable-3.7
# Create the new backport branch
git checkout -b fix/foo-stable-3.7
# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable-3.7More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport |
|
Kudos, SonarCloud Quality Gate passed!
|
|
Looks like backports need ro be done manually today... |
Should fix #5383.
For reference please check #5329