From a6450ed753f0bde810cbb659dbae76a2539282bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Wed, 10 Aug 2016 16:33:10 +0200 Subject: [PATCH 1/6] Bump VERSION to 6.0.3 --- lib/open_project/meeting/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/open_project/meeting/version.rb b/lib/open_project/meeting/version.rb index 3c231387ff..f27fdb1b99 100644 --- a/lib/open_project/meeting/version.rb +++ b/lib/open_project/meeting/version.rb @@ -20,6 +20,6 @@ module OpenProject module Meeting - VERSION = "6.0.2" + VERSION = "6.0.3" end end From 4e341e091cb9290d8230352395ab1d8f6a6375c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Tue, 16 Aug 2016 11:00:28 +0200 Subject: [PATCH 2/6] Bump VERSION to 6.0.4 --- lib/open_project/meeting/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/open_project/meeting/version.rb b/lib/open_project/meeting/version.rb index f27fdb1b99..24316e6c43 100644 --- a/lib/open_project/meeting/version.rb +++ b/lib/open_project/meeting/version.rb @@ -20,6 +20,6 @@ module OpenProject module Meeting - VERSION = "6.0.3" + VERSION = "6.0.4" end end From 9114b018b2912f91897cb9bc75ac3c7774cefb76 Mon Sep 17 00:00:00 2001 From: Henriette Dinger Date: Fri, 19 Aug 2016 15:15:11 +0200 Subject: [PATCH 3/6] Replace function by localized label --- app/views/meetings/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/meetings/index.html.erb b/app/views/meetings/index.html.erb index 9ede3fcb10..0623e07759 100644 --- a/app/views/meetings/index.html.erb +++ b/app/views/meetings/index.html.erb @@ -36,7 +36,7 @@ See doc/COPYRIGHT.md for more details.
<% @meetings_by_start_year_month_date.each do |year,meetings_by_start_month_date| -%> <% meetings_by_start_month_date.each do |month,meetings_by_start_date| -%> -

<%= "#{month_name(month)} #{year}" %>

+

<%= ::I18n.t('date.month_names')[month] + " #{year}" %>

<% meetings_by_start_date.each do |date,meetings| -%>

" class="date"><%= format_activity_day(date) %>

From e1ddbdf7ca26795fb3b44e5380b713e5d0833ac4 Mon Sep 17 00:00:00 2001 From: Henriette Dinger Date: Mon, 22 Aug 2016 09:35:58 +0200 Subject: [PATCH 4/6] Highlight menu entry --- app/controllers/meetings_controller.rb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/controllers/meetings_controller.rb b/app/controllers/meetings_controller.rb index 9859a9b41f..6ecee4ab92 100644 --- a/app/controllers/meetings_controller.rb +++ b/app/controllers/meetings_controller.rb @@ -81,6 +81,10 @@ class MeetingsController < ApplicationController def new end + current_menu_item :new do + :meetings + end + def copy params[:copied_from_meeting_id] = @meeting.id params[:copied_meeting_agenda_text] = @meeting.agenda.text if @meeting.agenda.present? From d454ac5d99009c532d76d955959f791c6c3845e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Mon, 22 Aug 2016 13:37:20 +0200 Subject: [PATCH 5/6] Improve logging for MeetingContentsController#send_for_review --- app/controllers/meeting_contents_controller.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/meeting_contents_controller.rb b/app/controllers/meeting_contents_controller.rb index b483360931..c90d16f2ff 100644 --- a/app/controllers/meeting_contents_controller.rb +++ b/app/controllers/meeting_contents_controller.rb @@ -84,14 +84,15 @@ class MeetingContentsController < ApplicationController def notify unless @content.new_record? author_mail = @content.meeting.author.mail - do_not_notify_author = @content.meeting.author.preference[:no_self_notified] + do_not_notify_author = @content.meeting.author.pref[:no_self_notified] recipients_with_errors = [] @content.meeting.participants.each do |recipient| begin next if recipient.mail == author_mail && do_not_notify_author MeetingMailer.content_for_review(@content, @content_type, recipient.mail).deliver_now - rescue + rescue => e + logger.error { "Failed to send review notification to #{recipient}: #{e.message}" } recipients_with_errors << recipient end end From bd4d9cd75f9ed85326d29acd46ccd52724da7973 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Thu, 25 Aug 2016 09:28:16 +0200 Subject: [PATCH 6/6] [23758] Use datetime object to format date https://community.openproject.com/work_packages/23758 --- app/views/meeting_mailer/content_for_review.html.erb | 2 +- app/views/meeting_mailer/content_for_review.text.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/meeting_mailer/content_for_review.html.erb b/app/views/meeting_mailer/content_for_review.html.erb index c77e54089d..0ff3d4287b 100644 --- a/app/views/meeting_mailer/content_for_review.html.erb +++ b/app/views/meeting_mailer/content_for_review.html.erb @@ -23,7 +23,7 @@ See doc/COPYRIGHT.md for more details. <%= @meeting.author %>
    -
  • <%=t :label_meeting_date_time %>: <%= format_date @meeting.start_date %> <%= format_time @meeting.start_time, false %>-<%= format_time @meeting.end_time, false %> <%= Time.zone %>
    • +
  • <%=t :label_meeting_date_time %>: <%= format_date @meeting.start_time %> <%= format_time @meeting.start_time, false %>-<%= format_time @meeting.end_time, false %> <%= Time.zone %>
  • <%=Meeting.human_attribute_name(:location) %>: <%= @meeting.location %>
  • <%=Meeting.human_attribute_name(:participants_invited) %>: <%= @meeting.participants.invited.sort.join("; ") %>
  • <%=Meeting.human_attribute_name(:participants_attended) %>: <%= @meeting.participants.attended.sort.join("; ") %>
    • diff --git a/app/views/meeting_mailer/content_for_review.text.erb b/app/views/meeting_mailer/content_for_review.text.erb index bdc6637c86..8f31b25430 100644 --- a/app/views/meeting_mailer/content_for_review.text.erb +++ b/app/views/meeting_mailer/content_for_review.text.erb @@ -22,7 +22,7 @@ See doc/COPYRIGHT.md for more details. <%= @meeting.project.name %>: <%= @meeting.title %> (<%= meeting_url(@meeting) %>) <%= @meeting.author %> -<%=t :label_meeting_date_time %>: <%= format_date @meeting.start_date %> <%= format_time @meeting.start_time, false %>-<%= format_time @meeting.end_time, false %> <%= Time.zone %> +<%=t :label_meeting_date_time %>: <%= format_date @meeting.start_time %> <%= format_time @meeting.start_time, false %>-<%= format_time @meeting.end_time, false %> <%= Time.zone %> <%= Meeting.human_attribute_name(:location) %>: <%= @meeting.location %> <%= Meeting.human_attribute_name(:participants_invited) %>: <%= @meeting.participants.invited.sort.join("; ") %> <%= Meeting.human_attribute_name(:participants_attended) %>: <%= @meeting.participants.attended.sort.join("; ") %>