Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] Can not save Unread Tray Icon Alert user preference #16313

Merged
merged 7 commits into from Apr 14, 2020
Merged

[FIX] Can not save Unread Tray Icon Alert user preference #16313

merged 7 commits into from Apr 14, 2020

Conversation

ghost
Copy link

@ghost ghost commented Jan 23, 2020 •
edited by ghost
Loading

Closes #16288
Closes #16314

DUPLICATE unreadAlert HTML-id.

Rocket.Chat/app/ui-account/client/accountPreferences.html

Line 105 in bf17f4c

<div class="input-line double-col" id="unreadAlert">

Rocket.Chat/app/ui-account/client/accountPreferences.html

Line 162 in bf17f4c

<div class="input-line double-col" id="unreadAlert">

The value of unreadAlert is obtained with the following code, but the value of another location (desktopNotificationRequireInteraction) is obtained.

Rocket.Chat/app/ui-account/client/accountPreferences.js

Line 184 in bf17f4c

data.unreadAlert = JSON.parse($('#unreadAlert').find('input:checked').val());

@ghost ghost changed the title [FIX] Can not save Unread Tray Icon Alert user preference (#16228) [FIX] Can not save Unread Tray Icon Alert user preference (#16288) Jan 23, 2020
@ghost ghost changed the title [FIX] Can not save Unread Tray Icon Alert user preference (#16288) [FIX] Can not save Unread Tray Icon Alert user preference Jan 24, 2020
gabriellsh
gabriellsh approved these changes Feb 11, 2020
View reviewed changes
Copy link
Member

@gabriellsh gabriellsh left a comment

Choose a reason for hiding this comment

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

Nice!

@CLAassistant
Copy link

CLA assistant check
All committers have signed the CLA.

@ggazzo ggazzo removed their assignment Apr 14, 2020
@ggazzo ggazzo added this to the 3.2.0 milestone Apr 14, 2020
@ggazzo ggazzo merged commit ae903c2 into RocketChat:develop Apr 14, 2020
gabriellsh added a commit that referenced this pull request Apr 14, 2020
@gabriellsh
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into adm/…
ad7b0a5 
…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
@gabriellsh
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into adm/…
8739a89 
…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)
  ...
ggazzo added a commit that referenced this pull request Apr 15, 2020
@ggazzo
Merge branch 'adm/mailer' of github.com:RocketChat/Rocket.Chat into a…
8ba9fb0 
…dm/mailer

* 'adm/mailer' of github.com:RocketChat/Rocket.Chat: (79 commits)
  removed unecessary prop
  Fixed sendMail function
  Removed Log, Success message
  Permissions
  added route component
  [FIX] "Invalid Invite" message when registration is disabled (#17226)
  Added route, error handling.
  [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)
  ...
dudizilla added a commit that referenced this pull request Apr 21, 2020
@dudizilla
Merge branch 'develop' of https://github.com/RocketChat/Rocket.Chat i…
960d7dd 
…nto view-logs

* 'develop' of https://github.com/RocketChat/Rocket.Chat: (31 commits)
  Fixed componentes width (#17322)
  [IMPROVE] Administration -> Mailer Rewrite to React. (#17191)
  Regression: Storybook  added flowrouter group mock (#17321)
  [NEW] Feature/custom oauth mail field and interpolation for mapped fields (#15690)
  [FIX] "Invalid Invite" message when registration is disabled (#17226)
  [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)
  ...
@sampaiodiego sampaiodiego mentioned this pull request Apr 27, 2020
Merged
@rodrigok rodrigok mentioned this pull request May 30, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.2.0
Development

Successfully merging this pull request may close these issues.

[BUG] Users can't change Unread Tray Icon Alert setting Unread Tray Icon Alert cannot be set to on
3 participants
@CLAassistant @gabriellsh @ggazzo