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.

Sign up for GitHub

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

Jump to bottom

Always use the folder icon depending on the mount type if not a share mount #16976

Merged
merged 2 commits into from
Sep 15, 2019
Merged

Always use the folder icon depending on the mount type if not a share mount #16976

merged 2 commits into from
Sep 15, 2019

Conversation

juliusknorr
Copy link
Member

As discussed with @jancborchardt the mount type (like groupfolder) should always take precedence of the share folder icon

Steps to reproduce:

  • Create a groupfolder
  • Share it with a user using the regular sharing
  • Reload the page
  • Open the sharing sidebar
  • See the groupfolder icon stay instead of the folder with sharing icon

@juliusknorr juliusknorr added 3. to review Waiting for reviews bug labels Sep 3, 2019
@juliusknorr
Copy link
Member Author

/backport to stable16

@juliusknorr
Copy link
Member Author

Pushed a fixup to still handle folders without a mountType properly

@juliusknorr juliusknorr force-pushed the bugfix/noid/directory-icon-mount branch from c6b1853 to 62f543f Compare September 3, 2019 14:09
@juliusknorr juliusknorr added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Sep 4, 2019
@rullzer rullzer added this to the Nextcloud 17 milestone Sep 4, 2019
@rullzer
Copy link
Member

rullzer commented Sep 4, 2019

Needs a rebase

@juliusknorr juliusknorr force-pushed the bugfix/noid/directory-icon-mount branch from 62f543f to e711155 Compare September 4, 2019 10:03
@rullzer rullzer mentioned this pull request Sep 4, 2019
Merged
16 tasks
@rullzer rullzer modified the milestones: Nextcloud 17, Nextcloud 18 Sep 5, 2019
@rullzer
Copy link
Member

rullzer commented Sep 5, 2019

Master is no 18 development. If this needs to go into 17 please follow the normal backport procedures after merging.

@rullzer rullzer added 2. developing Work in progress and removed 4. to release Ready to be released and/or waiting for tests to finish labels Sep 7, 2019
@rullzer
Copy link
Member

rullzer commented Sep 7, 2019

jsunit fails

@juliusknorr juliusknorr force-pushed the bugfix/noid/directory-icon-mount branch from e711155 to 1ac022a Compare September 12, 2019 13:16
@juliusknorr
Copy link
Member Author

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 juliusknorr added the 3. to review Waiting for reviews label Sep 13, 2019
@juliusknorr juliusknorr force-pushed the bugfix/noid/directory-icon-mount branch from 1ac022a to 105d63c Compare September 13, 2019 10:31
@juliusknorr
Copy link
Member Author

Yay, works again: https://drone.nextcloud.com/nextcloud/server/21612/1/3

Rebased and ready for review.

@juliusknorr juliusknorr removed the 2. developing Work in progress label Sep 13, 2019
@juliusknorr juliusknorr added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Sep 13, 2019
@juliusknorr @rullzer
Fallback to directory icon based on the mount type
260d93e 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@juliusknorr @rullzer
Bump bundles
d1724cb 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@rullzer rullzer force-pushed the bugfix/noid/directory-icon-mount branch from 105d63c to d1724cb Compare September 15, 2019 17:33
@rullzer rullzer merged commit 7149ed7 into master Sep 15, 2019
@rullzer rullzer deleted the bugfix/noid/directory-icon-mount branch September 15, 2019 19:11
@backportbot-nextcloud
Copy link

The backport to stable16 failed. Please do this backport manually.

@juliusknorr
Copy link
Member Author

/backport to stable17

@backportbot-nextcloud
Copy link

The backport to stable17 failed. Please do this backport manually.

This was referenced Sep 16, 2019
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@skjnldsv skjnldsv skjnldsv approved these changes

@rullzer rullzer rullzer approved these changes

@ChristophWurst ChristophWurst Awaiting requested review from ChristophWurst

@danxuliu danxuliu Awaiting requested review from danxuliu

Assignees
No one assigned
Labels
4. to release Ready to be released and/or waiting for tests to finish bug
Projects
None yet
Milestone
Nextcloud 18.0.0
Development

Successfully merging this pull request may close these issues.
3 participants
@juliusknorr @rullzer @skjnldsv