diff --git a/app/controllers/meetings_controller.rb b/app/controllers/meetings_controller.rb index 4d0477dfd7..3a7b1723e6 100644 --- a/app/controllers/meetings_controller.rb +++ b/app/controllers/meetings_controller.rb @@ -141,10 +141,9 @@ class MeetingsController < ApplicationController def convert_params start_date = params[:meeting].delete(:start_date) - start_time_4i = params[:meeting].delete(:"start_time(4i)") - start_time_5i = params[:meeting].delete(:"start_time(5i)") + start_time_hour = params[:meeting].delete(:"start_time_hour") begin - timestring = "#{start_date} #{start_time_4i}:#{start_time_5i}" + timestring = "#{start_date} #{start_time_hour}" time = Time.zone.parse(timestring) params[:meeting][:start_time] = time rescue ArgumentError diff --git a/app/helpers/message_accessibility_helper.rb b/app/helpers/message_accessibility_helper.rb deleted file mode 100644 index 0b73394250..0000000000 --- a/app/helpers/message_accessibility_helper.rb +++ /dev/null @@ -1,44 +0,0 @@ -#-- encoding: UTF-8 -#-- copyright -# OpenProject is a project management system. -# Copyright (C) 2012-2014 the OpenProject Foundation (OPF) -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License version 3. -# -# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -# Copyright (C) 2006-2013 Jean-Philippe Lang -# Copyright (C) 2010-2013 the ChiliProject Team -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# See doc/COPYRIGHT.rdoc for more details. -#++ - -module MessageAccessibilityHelper - def accessible_time_select(object_name, method, options = {}, html_options = {}) - labels = '' - select = time_select(object_name, method, options, html_options) - - select_ids = select.scan(/