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

Disable share view completely when server does not support/has disabled file sharing #5885

Merged
merged 8 commits into from
Jul 18, 2023
Merged

Disable share view completely when server does not support/has disabled file sharing #5885

merged 8 commits into from
Jul 18, 2023

Conversation

claucambra
Copy link
Collaborator

Fixes #5826

@claucambra claucambra self-assigned this Jul 13, 2023
@codecov
Copy link

codecov bot commented Jul 13, 2023 •
edited
Loading

Codecov Report

Merging #5885 (8d369ae) into master (871812d) will increase coverage by 0.03%.
The diff coverage is n/a.

❗ Current head 8d369ae differs from pull request most recent head d6125ca. Consider uploading reports for the commit d6125ca to get more accurate results

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #5885      +/-   ##
==========================================
+ Coverage   60.10%   60.13%   +0.03%     
==========================================
  Files         145      145              
  Lines       18746    18718      -28     
==========================================
- Hits        11267    11257      -10     
+ Misses       7479     7461      -18

see 4 files with indirect coverage changes

@mgallien
Copy link
Collaborator

/backport to stable-3.9

mgallien
mgallien reviewed Jul 17, 2023
View reviewed changes
Copy link
Collaborator

@mgallien mgallien left a comment

Choose a reason for hiding this comment

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

@claucambra see my comment

src/gui/filedetails/filedetails.cpp Outdated Show resolved Hide resolved
mgallien
mgallien requested changes Jul 18, 2023
View reviewed changes
Copy link
Collaborator

@mgallien mgallien left a comment

Choose a reason for hiding this comment

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

DCO check is failed
@claucambra please have a look

@claucambra claucambra force-pushed the bugfix/sharing-api-disabled-share-view branch from 8d369ae to a5631a0 Compare July 18, 2023 08:37
@claucambra
Copy link
Collaborator Author

DCO check is failed @claucambra please have a look

Oops, apologies, fixed

@claucambra claucambra requested a review from mgallien July 18, 2023 08:41
@claucambra claucambra enabled auto-merge (rebase) July 18, 2023 09:24
@claucambra claucambra force-pushed the bugfix/sharing-api-disabled-share-view branch from 925bbea to f62ade5 Compare July 18, 2023 09:27
@claucambra
Add sharingAvailable property to FileDetails class
38d82df 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Set sharingAvailable property in FileDetails from Folder account capa…
4bcff7d 
…bilities

Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Do not display sharing entry if sharing is not available on server
ea53978 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Do not handle setting page to sharing page if sharing not available
3fda519 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Fix background of tabbar in file details page
98ec8ff 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Make swipeIndex properties readonly
bccdb0e 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Compress share page tab button width and height when sharing API is d…
c1b2e07 
…isabled

Signed-off-by: Claudio Cambra <[email protected]>
@claucambra
Swap folder nullness assert for return
d6125ca 
Signed-off-by: Claudio Cambra <[email protected]>
@claucambra claucambra force-pushed the bugfix/sharing-api-disabled-share-view branch from f62ade5 to d6125ca Compare July 18, 2023 13:49
@claucambra claucambra disabled auto-merge July 18, 2023 13:57
@claucambra claucambra merged commit 1f9329c into master Jul 18, 2023
7 of 8 checks passed
@claucambra claucambra deleted the bugfix/sharing-api-disabled-share-view branch July 18, 2023 13:58
@backportbot-nextcloud backportbot-nextcloud bot mentioned this pull request Jul 18, 2023
Merged
@sonarcloud
Copy link

sonarcloud bot commented Jul 18, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

0.0% 0.0% Coverage
0.0% 0.0% Duplication

@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-5885-d6125ca3a197d5d7d60f38ef982f1e4a75b332e5-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

@mgallien mgallien added this to the 3.10.0 milestone Sep 7, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mgallien mgallien mgallien approved these changes

@camilasan camilasan Awaiting requested review from camilasan

@allexzander allexzander Awaiting requested review from allexzander

Assignees

@claucambra claucambra

Labels
None yet
Projects
None yet
Milestone
3.10.0
Development

Successfully merging this pull request may close these issues.

[Bug]: Share options are displayed when the "File sharing" app is disabled
3 participants
@claucambra @mgallien @nextcloud-desktop-bot