diff --git a/app/views/holidays/edit.html.erb b/app/views/holidays/edit.html.erb index a9bcf9e..2ea49fd 100644 --- a/app/views/holidays/edit.html.erb +++ b/app/views/holidays/edit.html.erb @@ -21,11 +21,11 @@ - + - + @@ -54,7 +54,8 @@ timepicker: false, datepicker: true, format: 'Y-m-d', - value: '<%= @holiday.start.blank? ? '' : @holiday.start.to_date.to_s %>' + value: '<%= @holiday.start.blank? ? '' : @holiday.start.to_date.to_s %>', + dayOfWeekStart: <%= (Setting.plugin_mega_calendar['week_start'].blank? ? '1' : Setting.plugin_mega_calendar['week_start'].to_s ) %> }; var options_end = { i18n: { @@ -66,7 +67,8 @@ timepicker: false, datepicker: true, format: 'Y-m-d', - value: '<%= @holiday.end.blank? ? '' : @holiday.end.to_date.to_s %>' + value: '<%= @holiday.end.blank? ? '' : @holiday.end.to_date.to_s %>', + dayOfWeekStart: <%= (Setting.plugin_mega_calendar['week_start'].blank? ? '1' : Setting.plugin_mega_calendar['week_start'].to_s ) %> }; $("#holiday_start").datetimepicker(options_start); $("#holiday_end").datetimepicker(options_end); diff --git a/app/views/holidays/new.html.erb b/app/views/holidays/new.html.erb index 6c392ed..ac5e1f1 100644 --- a/app/views/holidays/new.html.erb +++ b/app/views/holidays/new.html.erb @@ -20,11 +20,11 @@ - + - + @@ -49,7 +49,8 @@ }, timepicker: false, datepicker: true, - format: 'Y-m-d' + format: 'Y-m-d', + dayOfWeekStart: <%= (Setting.plugin_mega_calendar['week_start'].blank? ? '1' : Setting.plugin_mega_calendar['week_start'].to_s ) %> }; $("#holiday_start").datetimepicker(options); $("#holiday_end").datetimepicker(options); diff --git a/init.rb b/init.rb index 084e1c2..9dab515 100644 --- a/init.rb +++ b/init.rb @@ -103,7 +103,7 @@ name 'Mega Calendar plugin' author 'Andreas Treubert' description 'Better calendar for redmine' - version '1.9.2' + version '1.9.3' url 'https://github.com/berti92/mega_calendar' author_url 'https://github.com/berti92' requires_redmine :version_or_higher => '5.0.0'