Always use the folder icon depending on the mount type if not a share mount #16976
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
juliusknorr
requested review from
ChristophWurst,
danxuliu,
rullzer and
skjnldsv
|
/backport to stable16 |
skjnldsv
approved these changes
Sep 3, 2019
|
Pushed a fixup to still handle folders without a mountType properly |
rullzer
approved these changes
Sep 3, 2019
juliusknorr
force-pushed
the
bugfix/noid/directory-icon-mount
branch
from
c6b1853 to
62f543f
Compare
juliusknorr
added
4. to release
|
Needs a rebase |
juliusknorr
force-pushed
the
bugfix/noid/directory-icon-mount
branch
from
62f543f to
e711155
Compare
|
Master is no 18 development. If this needs to go into 17 please follow the normal backport procedures after merging. |
rullzer
added
2. developing
|
jsunit fails |
juliusknorr
force-pushed
the
bugfix/noid/directory-icon-mount
branch
from
e711155 to
1ac022a
Compare
|
Tried a different approach that also fixes the icon being correctly shown in the sidebar. At least the affected jsunit tests run fine locally now. Let'see. |
juliusknorr
force-pushed
the
bugfix/noid/directory-icon-mount
branch
from
1ac022a to
105d63c
Compare
|
Yay, works again: https://drone.nextcloud.com/nextcloud/server/21612/1/3 Rebased and ready for review. |
juliusknorr
added
4. to release
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
rullzer
force-pushed
the
bugfix/noid/directory-icon-mount
branch
from
105d63c to
d1724cb
Compare
|
The backport to stable16 failed. Please do this backport manually. |
|
/backport to stable17 |
|
The backport to stable17 failed. Please do this backport manually. |
This was referenced Sep 16, 2019
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As discussed with @jancborchardt the mount type (like groupfolder) should always take precedence of the share folder icon
Steps to reproduce: