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.

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

[stable12] Don't load navigation entries of restricted apps #5617

Merged
merged 2 commits into from Jul 7, 2017

Conversation

Projects
None yet
3 participants
@nickvergessen
Member

nickvergessen commented Jul 5, 2017

Backport #5615

Don't load navigation entries of restricted apps
Signed-off-by: Joas Schilling <coding@schilljs.com>
@MorrisJobke

Tested and works 👍

@MorrisJobke

This comment has been minimized.

Show comment
Hide comment
@MorrisJobke

MorrisJobke Jul 5, 2017

Member

@nickvergessen Somehow the unit tests fail :/

Member

MorrisJobke commented Jul 5, 2017

@nickvergessen Somehow the unit tests fail :/

@nickvergessen

This comment has been minimized.

Show comment
Hide comment
@nickvergessen

nickvergessen Jul 6, 2017

Member

yeah I know why... the merged settings thing is two navigation entries in stable12

Member

nickvergessen commented Jul 6, 2017

yeah I know why... the merged settings thing is two navigation entries in stable12

Adjust tests to the old settings menu
Signed-off-by: Joas Schilling <coding@schilljs.com>
@codecov

This comment has been minimized.

Show comment
Hide comment
@codecov

codecov bot Jul 6, 2017

Codecov Report

Merging #5617 into stable12 will decrease coverage by 16.47%.
The diff coverage is 0%.

@@               Coverage Diff               @@
##             stable12    #5617       +/-   ##
===============================================
- Coverage       54.15%   37.67%   -16.48%     
- Complexity      22348    22351        +3     
===============================================
  Files            1379     1379               
  Lines           85554    85553        -1     
  Branches         1329     1329               
===============================================
- Hits            46331    32233    -14098     
- Misses          39223    53320    +14097
Impacted Files Coverage Δ Complexity Δ
lib/private/NavigationManager.php 5.14% <0%> (-47.89%) 42 <0> (+3)
apps/files/lib/Activity/Settings/FileFavorite.php 0% <0%> (-100%) 8% <0%> (ø)
lib/public/AppFramework/Http/JSONResponse.php 0% <0%> (-100%) 5% <0%> (ø)
...mments/tests/Unit/Controller/NotificationsTest.php 0% <0%> (-100%) 4% <0%> (ø)
lib/private/App/AppStore/Version/Version.php 0% <0%> (-100%) 3% <0%> (ø)
lib/private/App/CodeChecker/EmptyCheck.php 0% <0%> (-100%) 6% <0%> (ø)
apps/dav/lib/CalDAV/PublicCalendarObject.php 0% <0%> (-100%) 1% <0%> (ø)
apps/dav/lib/CalDAV/Plugin.php 0% <0%> (-100%) 2% <0%> (ø)
lib/private/Hooks/ForwardingEmitter.php 0% <0%> (-100%) 5% <0%> (ø)
core/Command/Background/Ajax.php 0% <0%> (-100%) 1% <0%> (ø)
... and 471 more

codecov bot commented Jul 6, 2017

Codecov Report

Merging #5617 into stable12 will decrease coverage by 16.47%.
The diff coverage is 0%.

@@               Coverage Diff               @@
##             stable12    #5617       +/-   ##
===============================================
- Coverage       54.15%   37.67%   -16.48%     
- Complexity      22348    22351        +3     
===============================================
  Files            1379     1379               
  Lines           85554    85553        -1     
  Branches         1329     1329               
===============================================
- Hits            46331    32233    -14098     
- Misses          39223    53320    +14097
Impacted Files Coverage Δ Complexity Δ
lib/private/NavigationManager.php 5.14% <0%> (-47.89%) 42 <0> (+3)
apps/files/lib/Activity/Settings/FileFavorite.php 0% <0%> (-100%) 8% <0%> (ø)
lib/public/AppFramework/Http/JSONResponse.php 0% <0%> (-100%) 5% <0%> (ø)
...mments/tests/Unit/Controller/NotificationsTest.php 0% <0%> (-100%) 4% <0%> (ø)
lib/private/App/AppStore/Version/Version.php 0% <0%> (-100%) 3% <0%> (ø)
lib/private/App/CodeChecker/EmptyCheck.php 0% <0%> (-100%) 6% <0%> (ø)
apps/dav/lib/CalDAV/PublicCalendarObject.php 0% <0%> (-100%) 1% <0%> (ø)
apps/dav/lib/CalDAV/Plugin.php 0% <0%> (-100%) 2% <0%> (ø)
lib/private/Hooks/ForwardingEmitter.php 0% <0%> (-100%) 5% <0%> (ø)
core/Command/Background/Ajax.php 0% <0%> (-100%) 1% <0%> (ø)
... and 471 more
@juliushaertl

Works as expected! 👍

@MorrisJobke MorrisJobke merged commit 36e3f3c into stable12 Jul 7, 2017

1 check failed

continuous-integration/drone/pr the build failed
Details

@MorrisJobke MorrisJobke deleted the backport-5615-fix-navigation-entries-for-group-restricted-apps branch Jul 7, 2017

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