Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Nextcloud
- Activity
- Members
- Labels
- Service Desk
- Model experiments

Snippets Groups Projects

e5cacc0f

Unverified Commit e5cacc0f authored 6 years ago by Morris Jobke Committed by GitHub 6 years ago

Downloads
- Plain Diff

Merge pull request #14343 from nextcloud/bugfix/14052-multiple-navigation-items

Parse multiple navigation items

parents 3459ffc4 df3d5e85

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

lib/private/App/InfoParser.php 14 additions, 2 deletions

lib/private/App/InfoParser.php
lib/private/NavigationManager.php 3 additions, 3 deletions

lib/private/NavigationManager.php
tests/data/app/navigation-one-item.json 85 additions, 0 deletions

tests/data/app/navigation-one-item.json
tests/data/app/navigation-one-item.xml 74 additions, 0 deletions

tests/data/app/navigation-one-item.xml
tests/data/app/navigation-two-items.json 91 additions, 0 deletions

tests/data/app/navigation-two-items.json
tests/data/app/navigation-two-items.xml 80 additions, 0 deletions

tests/data/app/navigation-two-items.xml
tests/lib/App/InfoParserTest.php 9 additions, 7 deletions

tests/lib/App/InfoParserTest.php
tests/lib/NavigationManagerTest.php 14 additions, 6 deletions

tests/lib/NavigationManagerTest.php

with 370 additions and 18 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment