Skip to content

Allow to hide download option for folders shared by link - #12531

Merged
rullzer merged 4 commits into
masterfrom
bugfix/noid/hide-download-folders
Nov 20, 2018
Merged

Allow to hide download option for folders shared by link#12531
rullzer merged 4 commits into
masterfrom
bugfix/noid/hide-download-folders

Conversation

@juliusknorr

@juliusknorrjuliusknorr commented Nov 19, 2018

Copy link
Copy Markdown
Member
  • Enable "Hide download" share option for folders
  • Remove file selection and download option
  • Remove file action to download

Files we cannot display inline will still be downloaded. Right-clicking and opening the file in a new tab will also still cause the file to be downloaded.

@juliusknorrjuliusknorr mentioned this pull request Nov 19, 2018
Merged
@juliusknorrjuliusknorr added this to the Nextcloud 15 milestone Nov 19, 2018
@juliusknorr

juliusknorr commented Nov 19, 2018

Copy link
Copy Markdown
MemberAuthor

Companion PR to remove the download button from the gallery app slideshow: nextcloud/gallery#484

@rullzer

rullzer commented Nov 19, 2018

Copy link
Copy Markdown
Member

Files we cannot display inline will still be downloaded. Right-clicking and opening the file in a new tab will also still cause the file to be downloaded.

Fixed that :)

ChristophWurst
ChristophWurst reviewed Nov 20, 2018
View reviewed changes

@ChristophWurstChristophWurst left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and works, but I see some unexpected whitespace on the right:

bildschirmfoto von 2018-11-20 10-31-14

@MorrisJobke

MorrisJobke commented Nov 20, 2018

Copy link
Copy Markdown
Member

Tested and works, but I see some unexpected whitespace on the right:

Same here - is not there on master.

MorrisJobke
MorrisJobke approved these changes Nov 20, 2018
View reviewed changes

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and works 👍

@MorrisJobke

MorrisJobke commented Nov 20, 2018

Copy link
Copy Markdown
Member

JSUnit test fails:

PhantomJS 2.1.1 (Linux 0.0.0) OC.Share.ShareDialogLinkShareView hide download is not shown if the share is a folder FAILED
Expected 1 to be falsy.
core/js/tests/specs/sharedialoglinkshareview.js:117:50

@juliusknorr
juliusknorrforce-pushed the bugfix/noid/hide-download-folders branch from 053a5a4 to 88fb538CompareNovember 20, 2018 13:58
@juliusknorr

juliusknorr commented Nov 20, 2018

Copy link
Copy Markdown
MemberAuthor

@MorrisJobke Fixed as well https://drone.nextcloud.com/nextcloud/server/12857/287

@MorrisJobke

MorrisJobke commented Nov 20, 2018

Copy link
Copy Markdown
Member

Conflicts 🙈

@MorrisJobkeMorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Nov 20, 2018
juliusknorrand others added 4 commits November 20, 2018 19:46
@juliusknorr@rullzer
Allow to hide download option for folders shared by link
fb8aa31
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@rullzer
Compile handlebars
61c8696
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@rullzer
Clear link to avoid downloads
fc99811
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
@juliusknorr@rullzer
Fix whitespace and file action cleanup
78056a3
Signed-off-by: Julius Härtl <jus@bitgrid.net>
@rullzer
rullzerforce-pushed the bugfix/noid/hide-download-folders branch from 88fb538 to 78056a3CompareNovember 20, 2018 18:49
@rullzer
rullzer merged commit b150d27 into masterNov 20, 2018
@rullzer
rullzer deleted the bugfix/noid/hide-download-folders branch November 20, 2018 19:51
@MorrisJobkeMorrisJobke mentioned this pull request Nov 22, 2018
Merged
7 tasks
@MorrisJobkeMorrisJobke mentioned this pull request Nov 29, 2018
Closed
This was referenced Nov 29, 2018
Closed
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ChristophWurstChristophWurstChristophWurst left review comments
@MorrisJobkeMorrisJobkeMorrisJobke approved these changes
@jancborchardtjancborchardtAwaiting requested review from jancborchardt
@skjnldsvskjnldsvAwaiting requested review from skjnldsv
@danxuliudanxuliuAwaiting requested review from danxuliu
@rullzerrullzerAwaiting requested review from rullzer

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugfeature: filesfeature: sharing

Projects

None yet

Milestone

Nextcloud 15

Development

Successfully merging this pull request may close these issues.

4 participants

@juliusknorr@rullzer@MorrisJobke@ChristophWurst