Skip to content

Don't show 'Personal' header in settings when Admin section is not there - #14666

Merged
MorrisJobke merged 2 commits into
masterfrom
design/settings-header
Mar 18, 2019
Merged

Don't show 'Personal' header in settings when Admin section is not there#14666
MorrisJobke merged 2 commits into
masterfrom
design/settings-header

Conversation

@jancborchardt

@jancborchardtjancborchardt commented Mar 13, 2019•
edited
Loading

Copy link
Copy Markdown
Member

For regular users we don’t need to show the "Personal" heading because there’s no other headings anyway. For admins nothing changes.
Personal settings beforesettings after

@jancborchardtjancborchardt added this to the Nextcloud 17 milestone Mar 13, 2019
@jancborchardtjancborchardt mentioned this pull request Mar 13, 2019
Closed
rullzer
rullzer approved these changes Mar 13, 2019
View reviewed changes

@rullzerrullzer 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.

sure

@ChristophWurstChristophWurst added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Mar 15, 2019
@MorrisJobke

MorrisJobke commented Mar 15, 2019

Copy link
Copy Markdown
Member

@jancborchardt Mind to rebase on current master, because there were quite some fixes merged lately.

@rullzer
rullzerforce-pushed the design/settings-header branch from f8a604c to a25f956CompareMarch 15, 2019 15:36
@rullzer

rullzer commented Mar 15, 2019

Copy link
Copy Markdown
Member

This breaks the acceptance tests that checks for the personal header :P

@rullzerrullzer added 2. developing Work in progress and removed 4. to release Ready to be released and/or waiting for tests to finish labels Mar 16, 2019
@jancborchardt
Don't show 'Personal' header in settings when Admin section is not there
33bafb8
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
@jancborchardt
jancborchardtforce-pushed the design/settings-header branch from a25f956 to 33bafb8CompareMarch 18, 2019 12:14
@jancborchardt

jancborchardt commented Mar 18, 2019

Copy link
Copy Markdown
MemberAuthor

Rebased on master, but the test is not so easy to fix, as if we would change the:

Then I see that the "Personal" settings panel is shown

it wouldn’t test for the entire section? So it should check for the content instead of the heading. (FYI I’m on vacation and it’s out of my abilities, so I’m happy for someone to take over. :)

@MorrisJobkeMorrisJobke self-assigned this Mar 18, 2019
@MorrisJobke
Adjust acceptance tests
970d52f
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
@MorrisJobke

MorrisJobke commented Mar 18, 2019

Copy link
Copy Markdown
Member

it wouldn’t test for the entire section? So it should check for the content instead of the heading. (FYI I’m on vacation and it’s out of my abilities, so I’m happy for someone to take over. :)

I adjusted and fixed them 👍

MorrisJobke
MorrisJobke approved these changes Mar 18, 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.

Looks nice 👍

@MorrisJobkeMorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress labels Mar 18, 2019
@MorrisJobke

MorrisJobke commented Mar 18, 2019

Copy link
Copy Markdown
Member

Let's get this into 16 as it is just a small fix

@faily-bot

faily-botBot commented Mar 18, 2019

Copy link
Copy Markdown

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 17117: failure

TESTS=carddavtester-old-endpoint

@MorrisJobke

MorrisJobke commented Mar 18, 2019

Copy link
Copy Markdown
Member

Completely unrelated failure. I haven't seen this before.

@MorrisJobke
MorrisJobke merged commit 4824d27 into masterMar 18, 2019
@MorrisJobke
MorrisJobke deleted the design/settings-header branch March 18, 2019 13:48
@MorrisJobkeMorrisJobke mentioned this pull request Mar 20, 2019
Merged
9 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@rullzerrullzerrullzer approved these changes
@MorrisJobkeMorrisJobkeMorrisJobke approved these changes
@juliusknorrjuliusknorrjuliusknorr approved these changes
@ChristophWurstChristophWurstAwaiting requested review from ChristophWurst

Assignees

@MorrisJobkeMorrisJobke

Labels

4. to releaseReady to be released and/or waiting for tests to finishdesignDesign, UI, UX, etc.enhancementfeature: settings

Projects

None yet

Milestone

Nextcloud 16

Development

Successfully merging this pull request may close these issues.

5 participants

@jancborchardt@MorrisJobke@rullzer@juliusknorr@ChristophWurst