Skip to content

Parse multiple navigation items - #14343

Merged
MorrisJobke merged 3 commits into
masterfrom
bugfix/14052-multiple-navigation-items
Feb 27, 2019
Merged

Parse multiple navigation items#14343
MorrisJobke merged 3 commits into
masterfrom
bugfix/14052-multiple-navigation-items

Conversation

@kesselb

@kesselbkesselb commented Feb 22, 2019•
edited
Loading

Copy link
Copy Markdown
Contributor

Close#14052

Test

Pick any app with <navigations> in info.xml (e.g. activity) and add a second <navigation> item.

Expected

Two navigation items for this app

Actual

No navigation entry for this app

Known limitation

If id is not defined for navigation app name is used as fallback. At least one navigation item needs the id element with a value not equal to app name.

@kesselbkesselb added this to the Nextcloud 16 milestone Feb 22, 2019
@kesselb
Parse multiple navigation items
36c51bc
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb
kesselbforce-pushed the bugfix/14052-multiple-navigation-items branch from f8a7b91 to 36c51bcCompareFebruary 22, 2019 14:57
@nickvergessen

nickvergessen commented Feb 22, 2019

Copy link
Copy Markdown
Member

We could fallback to <appid><$i>

@kesselb

kesselb commented Feb 22, 2019•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

We could fallback to <appid><$i>

Don't have a strong opinion on that. Do you think someone would bind application logic to an navigation item and use <li data-id="activity">for it?

$id = isset($nav['id']) ? $nav['id'] : $app . ($navKey === 0 ? '' : $navKey);

Not nice but backwards compatible 🙈

$id = $nav['id'] ?? $app . ($navKey === 0 ? '' : $navKey);

PHP7+ looks a bit nicer 🤣

@nickvergessen

nickvergessen commented Feb 25, 2019

Copy link
Copy Markdown
Member

Good news, master is 7.1+
So I would go for that.

Well I think at least items should have a unique ID.

@kesselb
Generate id for navigation item
b578fd8
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
@kesselb
two item => two items
df3d5e8
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
MorrisJobke
MorrisJobke approved these changes Feb 27, 2019
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.

Code looks good, tested and works 👍

@juliusknorr

juliusknorr commented Feb 27, 2019

Copy link
Copy Markdown
Member

Failures unrelated.

@juliusknorrjuliusknorr added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Feb 27, 2019
@MorrisJobke
MorrisJobke merged commit e5cacc0 into masterFeb 27, 2019
@MorrisJobke
MorrisJobke deleted the bugfix/14052-multiple-navigation-items branch February 27, 2019 15:08
@MorrisJobke

MorrisJobke commented Feb 27, 2019

Copy link
Copy Markdown
Member

/backport to stable15

@MorrisJobke

MorrisJobke commented Feb 27, 2019

Copy link
Copy Markdown
Member

/backport to stable14

@backportbot-nextcloudbackportbot-nextcloudBot mentioned this pull request Feb 27, 2019
Merged
@backportbot-nextcloud

backportbot-nextcloudBot commented Feb 27, 2019

Copy link
Copy Markdown

backport to stable15 in #14416

@backportbot-nextcloudbackportbot-nextcloudBot mentioned this pull request Feb 27, 2019
Merged
@backportbot-nextcloud

backportbot-nextcloudBot commented Feb 27, 2019

Copy link
Copy Markdown

backport to stable14 in #14417

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

Reviewers

@MorrisJobkeMorrisJobkeMorrisJobke approved these changes
@juliusknorrjuliusknorrjuliusknorr approved these changes
@nickvergessennickvergessenAwaiting requested review from nickvergessen

Assignees

No one assigned

Labels

4. to releaseReady to be released and/or waiting for tests to finishbug

Projects

None yet

Milestone

Nextcloud 16

Development

Successfully merging this pull request may close these issues.

4 participants

@kesselb@nickvergessen@juliusknorr@MorrisJobke