Skip to content

hide strange Everyone and Disabled group numbers with LDAP - #17450

Merged
blizzz merged 3 commits into
masterfrom
fix/17368/odd-group-numbers
Oct 21, 2019
Merged

hide strange Everyone and Disabled group numbers with LDAP#17450
blizzz merged 3 commits into
masterfrom
fix/17368/odd-group-numbers

Conversation

@blizzz

@blizzzblizzz commented Oct 7, 2019

Copy link
Copy Markdown
Member

fixes#17368

Before:

Screenshot_20191007_182750

Now:

Screenshot_20191007_182925

@blizzzblizzz added this to the Nextcloud 18 milestone Oct 7, 2019
@blizzzblizzz changed the title hide strange Everyone and Disabled group numbers with LDAP, fixes 17368hide strange Everyone and Disabled group numbers with LDAPOct 7, 2019
@juliusknorr

Copy link
Copy Markdown
Member

Bundles need to be updated as well

@blizzz

Copy link
Copy Markdown
MemberAuthor

/compile /apps/settings

Comment threadapps/settings/src/views/Users.vue Outdated
@blizzz
blizzzforce-pushed the fix/17368/odd-group-numbers branch from c566902 to 68ea78eCompareOctober 8, 2019 08:36
@blizzz
blizzz requested a review from skjnldsvOctober 8, 2019 13:16
groups.unshift(disabledGroup)
if (disabledGroup.utils.counter === -1) {
// hides the counter instead of showing -1
delete disabledGroup.utils.counter

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.

Ah wait, I'm an idiot.
Did not saw the line above. If you do this, then the next call will remove the disable entry in the menu 🙈

We should definitely find another way 😬

@blizzzblizzzOct 8, 2019

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, at least it was not removed for me locally. Did you try, or do you assume? :D

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.

I assumed (wrongly? 🤔 😁 )

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As said, it works for me both ways.

@blizzz

This comment has been minimized.

@skjnldsv

This comment has been minimized.

@blizzz

Copy link
Copy Markdown
MemberAuthor

it's a bit cumbersome for resources only being built

@blizzz
blizzzforce-pushed the fix/17368/odd-group-numbers branch from cacbdce to 67c9590CompareOctober 14, 2019 10:08
@blizzz
blizzz requested a review from skjnldsvOctober 14, 2019 10:09
@blizzz
blizzzforce-pushed the fix/17368/odd-group-numbers branch from 67c9590 to da90156CompareOctober 15, 2019 15:17
@blizzz

Copy link
Copy Markdown
MemberAuthor

rebased again…

@skjnldsvskjnldsv added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Oct 15, 2019
@blizzzblizzz added 2. developing Work in progress and removed 4. to release Ready to be released and/or waiting for tests to finish labels Oct 15, 2019
@blizzz

Copy link
Copy Markdown
MemberAuthor

Ah, I have an addition: group numbers are also increased or decreased when a user is added or removed from a group. Commit comming soon.

@blizzz
blizzzforce-pushed the fix/17368/odd-group-numbers branch from da90156 to a7f4f71CompareOctober 15, 2019 16:21
@blizzzblizzz added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Oct 15, 2019
@blizzz

Copy link
Copy Markdown
MemberAuthor

/compile amend /

@npmbuildbot-nextcloud
npmbuildbot-nextcloudBotforce-pushed the fix/17368/odd-group-numbers branch from a7f4f71 to e68492dCompareOctober 16, 2019 08:25
@blizzz

Copy link
Copy Markdown
MemberAuthor

/backport to stable17

@blizzz

Copy link
Copy Markdown
MemberAuthor

/backport to stable16

@blizzzblizzz added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Oct 16, 2019
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
@blizzz
blizzzforce-pushed the fix/17368/odd-group-numbers branch from e68492d to 72a8703CompareOctober 21, 2019 08:09
@blizzz

Copy link
Copy Markdown
MemberAuthor

/compile /

Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
@blizzz
blizzz merged commit 75ecae2 into masterOct 21, 2019
@blizzz
blizzz deleted the fix/17368/odd-group-numbers branch October 21, 2019 09:53
@backportbot-nextcloud

Copy link
Copy Markdown

The backport to stable17 failed. Please do this backport manually.

@backportbot-nextcloud

Copy link
Copy Markdown

The backport to stable16 failed. Please do this backport manually.

blizzz added a commit that referenced this pull request Oct 21, 2019
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
blizzz added a commit that referenced this pull request Oct 21, 2019
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

4. to releaseReady to be released and/or waiting for tests to finishbugfeature: users and groups

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Everyone and disabled count with LDAP

4 participants

@blizzz@juliusknorr@skjnldsv@rullzer