X Tutup
Skip to content

[stable10] dont allow user to override admin sharing settings when its disabled#34842

Merged
phil-davis merged 1 commit intostable10from
backport-34764
Mar 20, 2019
Merged

[stable10] dont allow user to override admin sharing settings when its disabled#34842
phil-davis merged 1 commit intostable10from
backport-34764

Conversation

@karakayasemi
Copy link
Contributor

@karakayasemi karakayasemi commented Mar 20, 2019

Backport of #34764

Description

Implementation of https://github.com/owncloud/enterprise/issues/3128#issuecomment-471185144

If all the options are disabled by admin, instead of showing empty page, I added Nothing to configure sentence for each section.

To-do:

  • Fix acceptance tests

Related Issue

Fixes https://github.com/owncloud/enterprise/issues/3128
Closes #34763
Closes #34708

Motivation and Context

How Has This Been Tested?

  • Disable auto_accept options from admin panel
  • User should see Nothing to configure text in sharing personal panel
  • Enable auto_accept options from admin panel
  • User should allowed to make their own choice

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Database schema changes (next release will require increase of minor version instead of patch)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:

@karakayasemi karakayasemi self-assigned this Mar 20, 2019
@codecov
Copy link

codecov bot commented Mar 20, 2019

Codecov Report

Merging #34842 into stable10 will increase coverage by <.01%.
The diff coverage is 81.39%.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #34842      +/-   ##
==============================================
+ Coverage       64.23%   64.23%   +<.01%     
- Complexity      19895    19901       +6     
==============================================
  Files            1277     1277              
  Lines           76244    76270      +26     
  Branches         1292     1292              
==============================================
+ Hits            48972    48992      +20     
- Misses          26893    26899       +6     
  Partials          379      379
Flag Coverage Δ Complexity Δ
#javascript 53.2% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.4% <81.39%> (ø) 19901 <0> (+6) ⬆️
Impacted Files Coverage Δ Complexity Δ
apps/files_sharing/templates/settings-personal.php 20% <0%> (-46.67%) 0 <0> (ø)
...ilesharing/templates/settings-personal-sharing.php 20% <0%> (-46.67%) 0 <0> (ø)
...es_sharing/lib/Controller/Share20OcsController.php 85.39% <100%> (+0.05%) 194 <0> (+1) ⬆️
...iles_sharing/lib/Panels/Personal/PersonalPanel.php 100% <100%> (ø) 6 <0> (+2) ⬆️
...pps/federatedfilesharing/lib/Panels/AdminPanel.php 100% <100%> (ø) 4 <0> (ø) ⬇️
...ederatedfilesharing/lib/FederatedShareProvider.php 61.13% <100%> (+0.17%) 85 <0> (+1) ⬆️
...tedfilesharing/lib/Panels/SharingPersonalPanel.php 100% <100%> (ø) 6 <0> (+2) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5de5687...015ef80. Read the comment docs.

1 similar comment
@codecov
Copy link

codecov bot commented Mar 20, 2019 •
edited
Loading

Codecov Report

Merging #34842 into stable10 will increase coverage by <.01%.
The diff coverage is 81.39%.

Impacted file tree graph

@@              Coverage Diff               @@
##             stable10   #34842      +/-   ##
==============================================
+ Coverage       64.23%   64.23%   +<.01%     
- Complexity      19895    19901       +6     
==============================================
  Files            1277     1277              
  Lines           76244    76270      +26     
  Branches         1292     1292              
==============================================
+ Hits            48972    48992      +20     
- Misses          26893    26899       +6     
  Partials          379      379
Flag Coverage Δ Complexity Δ
#javascript 53.2% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.4% <81.39%> (ø) 19901 <0> (+6) ⬆️
Impacted Files Coverage Δ Complexity Δ
apps/files_sharing/templates/settings-personal.php 20% <0%> (-46.67%) 0 <0> (ø)
...ilesharing/templates/settings-personal-sharing.php 20% <0%> (-46.67%) 0 <0> (ø)
...es_sharing/lib/Controller/Share20OcsController.php 85.39% <100%> (+0.05%) 194 <0> (+1) ⬆️
...iles_sharing/lib/Panels/Personal/PersonalPanel.php 100% <100%> (ø) 6 <0> (+2) ⬆️
...pps/federatedfilesharing/lib/Panels/AdminPanel.php 100% <100%> (ø) 4 <0> (ø) ⬇️
...ederatedfilesharing/lib/FederatedShareProvider.php 61.13% <100%> (+0.17%) 85 <0> (+1) ⬆️
...tedfilesharing/lib/Panels/SharingPersonalPanel.php 100% <100%> (ø) 6 <0> (+2) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5de5687...015ef80. Read the comment docs.

@phil-davis phil-davis merged commit 005ede2 into stable10 Mar 20, 2019
@delete-merged-branch delete-merged-branch bot deleted the backport-34764 branch March 20, 2019 10:45
This was referenced Apr 15, 2019
Closed
Closed
@lock lock bot locked as resolved and limited conversation to collaborators Mar 21, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@phil-davis phil-davis phil-davis approved these changes

@individual-it individual-it Awaiting requested review from individual-it

Assignees

@karakayasemi karakayasemi

Labels

4 - To release

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@karakayasemi @phil-davis
X Tutup