Skip to content

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

Merged
rullzer merged 2 commits into
masterfrom
bugfix/noid/directory-icon-mount
Sep 15, 2019
Merged

Always use the folder icon depending on the mount type if not a share mount#16976
rullzer merged 2 commits into
masterfrom
bugfix/noid/directory-icon-mount

Conversation

@juliusknorr

Copy link
Copy Markdown
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

Copy link
Copy Markdown
MemberAuthor

/backport to stable16

@juliusknorr

Copy link
Copy Markdown
MemberAuthor

Pushed a fixup to still handle folders without a mountType properly

@juliusknorr
juliusknorrforce-pushed the bugfix/noid/directory-icon-mount branch from c6b1853 to 62f543fCompareSeptember 3, 2019 14:09
@juliusknorrjuliusknorr 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
@rullzerrullzer added this to the Nextcloud 17 milestone Sep 4, 2019
@rullzer

Copy link
Copy Markdown
Member

Needs a rebase

@juliusknorr
juliusknorrforce-pushed the bugfix/noid/directory-icon-mount branch from 62f543f to e711155CompareSeptember 4, 2019 10:03
@rullzerrullzer mentioned this pull request Sep 4, 2019
16 tasks
@rullzerrullzer modified the milestones: Nextcloud 17, Nextcloud 18Sep 5, 2019
@rullzer

Copy link
Copy Markdown
Member

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

@rullzerrullzer 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
Copy Markdown
Member

jsunit fails

@juliusknorr
juliusknorrforce-pushed the bugfix/noid/directory-icon-mount branch from e711155 to 1ac022aCompareSeptember 12, 2019 13:16
@juliusknorr

Copy link
Copy Markdown
MemberAuthor

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.

@juliusknorrjuliusknorr added the 3. to review Waiting for reviews label Sep 13, 2019
@juliusknorr
juliusknorrforce-pushed the bugfix/noid/directory-icon-mount branch from 1ac022a to 105d63cCompareSeptember 13, 2019 10:31
@juliusknorr

Copy link
Copy Markdown
MemberAuthor

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

Rebased and ready for review.

@juliusknorrjuliusknorr removed the 2. developing Work in progress label Sep 13, 2019
@juliusknorrjuliusknorr 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
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@rullzer
rullzerforce-pushed the bugfix/noid/directory-icon-mount branch from 105d63c to d1724cbCompareSeptember 15, 2019 17:33
@rullzer
rullzer merged commit 7149ed7 into masterSep 15, 2019
@rullzer
rullzer deleted the bugfix/noid/directory-icon-mount branch September 15, 2019 19:11
@backportbot-nextcloud

Copy link
Copy Markdown

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

@juliusknorr

Copy link
Copy Markdown
MemberAuthor

/backport to stable17

@backportbot-nextcloud

Copy link
Copy Markdown

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

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finishbug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@juliusknorr@rullzer@skjnldsv