scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-12-09 13:46:21 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix notification settings accessors [SCI-1864]

Browse source
This commit is contained in:
Oleksii Kriuchykhin 2017-12-13 11:59:53 +01:00
parent 6256acdfea
commit baf3151bb0
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/users/settings/account/preferences_controller.rb
View file

@ -77,15 +77,15 @@ module Users
end
def notifications_settings
@user.settings[:notifications][:assignments] =
@user.assignments_notification =
params[:assignments_notification] ? true : false
@user.settings[:notifications][:recent] =
@user.recent_notification =
params[:recent_notification] ? true : false
@user.settings[:notifications][:recent_email] =
@user.recent_email_notification =
params[:recent_notification_email] ? true : false
@user.settings[:notifications][:assignments_email] =
@user.assignments_email_notification =
params[:assignments_notification_email] ? true : false
@user.settings[:notifications][:system_message_email] =
@user.system_message_email_notification =
params[:system_message_notification_email] ? true : false
if @user.save

2
app/services/client_api/invitations_service.rb
View file

@ -151,7 +151,7 @@ module ClientApi
message: sanitize_input(message)
)
if target_user.settings[:notifications][:assignments]
if target_user.assignments_notification
UserNotification.create(notification: notification, user: target_user)
end
end

10
app/views/users/settings/account/preferences/index.html.erb
View file

@ -79,7 +79,7 @@
<%=t 'notifications.form.notification_scinote' %>
</div>
<div class="col-sm-8">
<%= check_box_tag :assignments_notification, @user.settings[:notifications][:assignments] %>
<%= check_box_tag :assignments_notification, @user.assignments_notification %>
</div>
</div>
<div class="row">
@ -87,7 +87,7 @@
<%=t 'notifications.form.notification_email' %>
</div>
<div class="col-sm-8">
<%= check_box_tag :assignments_notification_email, @user.settings[:notifications][:assignments_email] %>
<%= check_box_tag :assignments_notification_email, @user.assignments_email_notification %>
</div>
</div>
</div>
@ -104,7 +104,7 @@
<%=t 'notifications.form.notification_scinote' %>
</div>
<div class="col-sm-8">
<%= check_box_tag :recent_notification, @user.settings[:notifications][:recent] %>
<%= check_box_tag :recent_notification, @user.recent_notification %>
</div>
</div>
<div class="row">
@ -112,7 +112,7 @@
<%=t 'notifications.form.notification_email' %>
</div>
<div class="col-sm-8">
<%= check_box_tag :recent_notification_email, @user.settings[:notifications][:recent_email] %>
<%= check_box_tag :recent_notification_email, @user.recent_email_notification %>
</div>
</div>
</div>
@ -137,7 +137,7 @@
<%=t 'notifications.form.notification_email' %>
</div>
<div class="col-sm-8">
<%= check_box_tag :system_message_notification_email, @user.settings[:notifications][:system_message_email] %>
<%= check_box_tag :system_message_notification_email, @user.system_message_email_notification %>
</div>
</div>
</div>