Skip to content

[FIX] Fixed email sort button in directory -> users#16606

Merged
ggazzo merged 2 commits intoRocketChat:developfrom
ashwaniYDV:directoryemailissue
Apr 14, 2020
Merged

[FIX] Fixed email sort button in directory -> users#16606
ggazzo merged 2 commits intoRocketChat:developfrom
ashwaniYDV:directoryemailissue

Conversation

@ashwaniYDV
Copy link
Copy Markdown
Contributor

@ashwaniYDV ashwaniYDV commented Feb 14, 2020

Closes #16605

Description

We have to check both by email and username field for sorting since email is taken as result.emails[0].address || results.username.
Therefore if no email found then username is taken as email field.

Before:

12

After:

11

@ashwaniYDV ashwaniYDV changed the title [FIX] Directory users email sort button [FIX] Fixed email sort button in directory -> users Feb 15, 2020
@ashwaniYDV
Copy link
Copy Markdown
Contributor Author

ashwaniYDV commented Feb 24, 2020

@ggazzo Please review
In the switch case, email is not valid. emails.address or username should be used.

gabriellsh
gabriellsh previously approved these changes Feb 27, 2020
@gabriellsh gabriellsh added area: ui/ux Related to UI/UX, frontend code, accessibility, and user interaction type: bug labels Mar 5, 2020
@CLAassistant
Copy link
Copy Markdown

CLA assistant check
All committers have signed the CLA.

@ggazzo ggazzo merged commit a05a2d5 into RocketChat:develop Apr 14, 2020
@ggazzo ggazzo added this to the 3.2.0 milestone Apr 14, 2020
@ashwaniYDV ashwaniYDV deleted the directoryemailissue branch April 14, 2020 13:35
gabriellsh added a commit that referenced this pull request Apr 14, 2020
…users_and_rooms

* 'develop' of github.com:RocketChat/Rocket.Chat:
  [FIX] Omnichannel SMS / WhatsApp integration errors due to missing location data (#17288)
  [FIX] User search on directory not working correctly (#17299)
  [FIX] Can not save Unread Tray Icon Alert user preference (#16288) (#16313)
  [FIX] Variable rendering problem on Import recent history page (#15997)
  [FIX] Admin panel custom sounds, multiple sound playback fix and added single play/pause button (#16215)
  [FIX] Discussions created from inside DMs were not working (#17282)
  [FIX] translation for nl (#16742)
  [FIX] No maxlength defined for custom user status (#16534)
  [FIX] Directory users email sort button (#16606)
  [FIX] In Create a New Channel, input should be focused on channel name instead of invite users (#16405)
  [FIX] Email not verified message (#16236)
  [FIX] Directory default tab (#17283)
  Update ru.i18n.json (#16869)
  [FIX] Avatar on sidebar when showing real names (#17286)
  Update Apps-Engine to stable version (#17287)
  [NEW][ENTERPRISE] Auto close abandoned Omnichannel rooms (#17055)
  Static props for Administration route components (#17285)
  [NEW] Default favorite channels (#16025)
  Apply $and helper to message template (#17280)
gabriellsh added a commit that referenced this pull request Apr 15, 2020
…mailer

* 'develop' of github.com:RocketChat/Rocket.Chat: (93 commits)
  [FIX] Red color error outline is not removed after password update (#16536)
  [FIX] Change wording to start DM from info panel (#8799)
  New hooks for RouterContext (#17305)
  [FIX] SAML assertion signature enforcement (#17278)
  [FIX] LDAP users lose session on refresh (#17302)
  [NEW] Add MMS support to Voxtelesys (#17217)
  [FIX] Popover component doesn't have scroll (#17198)
  [FIX] Omnichannel SMS / WhatsApp integration errors due to missing location data (#17288)
  [FIX] User search on directory not working correctly (#17299)
  [FIX] Can not save Unread Tray Icon Alert user preference (#16288) (#16313)
  [FIX] Variable rendering problem on Import recent history page (#15997)
  [FIX] Admin panel custom sounds, multiple sound playback fix and added single play/pause button (#16215)
  [FIX] Discussions created from inside DMs were not working (#17282)
  [FIX] translation for nl (#16742)
  [FIX] No maxlength defined for custom user status (#16534)
  [FIX] Directory users email sort button (#16606)
  [FIX] In Create a New Channel, input should be focused on channel name instead of invite users (#16405)
  [FIX] Email not verified message (#16236)
  [FIX] Directory default tab (#17283)
  Update ru.i18n.json (#16869)
  ...
@sampaiodiego sampaiodiego mentioned this pull request Apr 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area: ui/ux Related to UI/UX, frontend code, accessibility, and user interaction type: bug

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[BUG] Directory -> users, email sort button not working

4 participants