redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes Column 'dmsf_mail_notification' cannot be null

Browse Source 
The partial app/views/dmsf_state/_user_pref.html.erb uses a condition
to include the email_notify setting only if the corresponding
notified_event is enabled. The database field email_notify, however,
does not accept a null value. But this is what occurs when the notified
event is disabled.

This patch changes the DmsfStateController to assign params[:email_notify]
only if the notified_event for dmsf_legacy_notifications is enabled.
This commit is contained in:
Liane Hampe 2024-11-25 10:29:36 +01:00
parent fa62c09d87
commit 77df49993c
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/dmsf_state_controller.rb
View File

@ -28,7 +28,9 @@ class DmsfStateController < ApplicationController
def user_pref_save def user_pref_save
member = @project.members.find_by(user_id: User.current.id) member = @project.members.find_by(user_id: User.current.id)
if member if member
member.dmsf_mail_notification = params[:email_notify] if Setting.notified_events.include?('dmsf_legacy_notifications')
member.dmsf_mail_notification = params[:email_notify]
end
member.dmsf_title_format = params[:title_format] member.dmsf_title_format = params[:title_format]
member.dmsf_fast_links = params[:fast_links].present? member.dmsf_fast_links = params[:fast_links].present?
if format_valid?(member.dmsf_title_format) && member.save if format_valid?(member.dmsf_title_format) && member.save

25
test/functional/dmsf_state_controller_test.rb
View File

@ -32,17 +32,38 @@ class DmsfStateControllerTest < RedmineDmsf::Test::TestCase
end end
def test_user_pref_save_member def test_user_pref_save_member
with_settings notified_events: ['dmsf_legacy_notifications'] do
post '/login', params: { username: 'jsmith', password: 'jsmith' }
@role_manager.add_permission! :user_preferences
post "/projects/#{@project1.id}/dmsf/state",
params: { email_notify: 1, title_format: '%t_%v', fast_links: 1, act_as_attachable: 1,
default_dmsf_query: @query401.id }
assert_redirected_to settings_project_path(@project1, tab: 'dmsf')
assert_not_nil flash[:notice]
assert_equal flash[:notice], l(:notice_your_preferences_were_saved)
member = @project1.members.find_by(user_id: @jsmith.id)
assert member
assert_equal true, member.dmsf_mail_notification
assert_equal '%t_%v', member.dmsf_title_format
assert_equal true, member.dmsf_fast_links
@project1.reload
assert_equal 1, @project1.dmsf_act_as_attachable
assert_equal @query401.id, @project1.default_dmsf_query_id
end
end
def test_user_pref_save_whithout_email_notification_settings
post '/login', params: { username: 'jsmith', password: 'jsmith' } post '/login', params: { username: 'jsmith', password: 'jsmith' }
@role_manager.add_permission! :user_preferences @role_manager.add_permission! :user_preferences
post "/projects/#{@project1.id}/dmsf/state", post "/projects/#{@project1.id}/dmsf/state",
params: { email_notify: 1, title_format: '%t_%v', fast_links: 1, act_as_attachable: 1, params: { title_format: '%t_%v', fast_links: 1, act_as_attachable: 2,
default_dmsf_query: @query401.id } default_dmsf_query: @query401.id }
assert_redirected_to settings_project_path(@project1, tab: 'dmsf') assert_redirected_to settings_project_path(@project1, tab: 'dmsf')
assert_not_nil flash[:notice] assert_not_nil flash[:notice]
assert_equal flash[:notice], l(:notice_your_preferences_were_saved) assert_equal flash[:notice], l(:notice_your_preferences_were_saved)
member = @project1.members.find_by(user_id: @jsmith.id) member = @project1.members.find_by(user_id: @jsmith.id)
assert member assert member
assert_equal true, member.dmsf_mail_notification assert_not member.dmsf_mail_notification
assert_equal '%t_%v', member.dmsf_title_format assert_equal '%t_%v', member.dmsf_title_format
assert_equal true, member.dmsf_fast_links assert_equal true, member.dmsf_fast_links
@project1.reload @project1.reload