diff --git a/Gemfile b/Gemfile index bac187b1..49d96fb1 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,21 @@ group :openid do end group :rmagick do - gem "rmagick", "~> 1.15.17" + gem "rmagick", ">= 1.15.17" + # Older distributions might not have a sufficiently new ImageMagick version + # for the current rmagick release (current rmagick is rmagick 2, which + # requires ImageMagick 6.4.9 or later). If this is the case for you, comment + # the line above this comment block and uncomment the one underneath it to + # get an rmagick version known to work on older distributions. + # + # The following distributíons are known to *not* ship with a usable + # ImageMagick version. There might be additional ones. + # * Ubuntu 9.10 and older + # * Debian Lenny 5.0 and older + # * CentOS 5 and older + # * RedHat 5 and older + # + #gem "rmagick", "< 2.0.0" end # Use the commented pure ruby gems, if you have not the needed prerequisites on @@ -33,11 +47,6 @@ end # warned. platforms :mri, :mingw do - group :mysql do - gem "mysql" - # gem "ruby-mysql" - end - group :mysql2 do gem "mysql2", "~> 0.2.7" end @@ -49,6 +58,11 @@ platforms :mri, :mingw do end platforms :mri_18, :mingw_18 do + group :mysql do + gem "mysql" + # gem "ruby-mysql" + end + group :sqlite do gem "sqlite3-ruby", "< 1.3", :require => "sqlite3" end diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index fc26cacc..9d570a9a 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb index d9cf6f1d..2265284e 100644 --- a/app/controllers/activities_controller.rb +++ b/app/controllers/activities_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 7cf9f456..4b0d4ff4 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 57d77f54..c5da0b44 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # @@ -42,6 +43,24 @@ class ApplicationController < ActionController::Base end end + # FIXME: Remove this when all of Rack and Rails have learned how to + # properly use encodings + before_filter :params_filter + def params_filter + self.utf8nize!(params) if RUBY_VERSION >= '1.9' + end + def utf8nize!(obj) + if obj.is_a? String + obj.respond_to?(:force_encoding) ? obj.force_encoding("UTF-8") : obj + elsif obj.is_a? Hash + obj.each {|k, v| obj[k] = self.utf8nize!(v)} + elsif obj.is_a? Array + obj.each {|v| self.utf8nize!(v)} + else + obj + end + end + before_filter :user_setup, :check_if_login_required, :set_localization filter_parameter_logging :password @@ -262,7 +281,7 @@ class ApplicationController < ActionController::Base end def redirect_back_or_default(default) - back_url = CGI.unescape(params[:back_url].to_s) + back_url = URI.escape(CGI.unescape(params[:back_url].to_s)) if !back_url.blank? begin uri = URI.parse(back_url) diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index f2992a25..908c0206 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/auth_sources_controller.rb b/app/controllers/auth_sources_controller.rb index dbe11256..ba468826 100644 --- a/app/controllers/auth_sources_controller.rb +++ b/app/controllers/auth_sources_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/auto_completes_controller.rb b/app/controllers/auto_completes_controller.rb index 27ef1667..becc957d 100644 --- a/app/controllers/auto_completes_controller.rb +++ b/app/controllers/auto_completes_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb index 9e9700e7..04553d7a 100644 --- a/app/controllers/boards_controller.rb +++ b/app/controllers/boards_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/calendars_controller.rb b/app/controllers/calendars_controller.rb index 6161b6ed..cb16e738 100644 --- a/app/controllers/calendars_controller.rb +++ b/app/controllers/calendars_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # @@ -36,9 +37,9 @@ class CalendarsController < ApplicationController if @query.valid? events = [] events += @query.issues(:include => [:tracker, :assigned_to, :priority], - :conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt] + :conditions => ["((#{Issue.table_name}.start_date BETWEEN ? AND ?) OR (#{Issue.table_name}.due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt] ) - events += @query.versions(:conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt]) + events += @query.versions(:conditions => ["#{Version.table_name}.effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt]) @calendar.events = events end diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index fafeea92..d0536c9e 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/context_menus_controller.rb b/app/controllers/context_menus_controller.rb index b1099b66..628212a2 100644 --- a/app/controllers/context_menus_controller.rb +++ b/app/controllers/context_menus_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/custom_fields_controller.rb b/app/controllers/custom_fields_controller.rb index 294328ac..daf3c0c4 100644 --- a/app/controllers/custom_fields_controller.rb +++ b/app/controllers/custom_fields_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb index be66e1f1..776b4759 100644 --- a/app/controllers/documents_controller.rb +++ b/app/controllers/documents_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/enumerations_controller.rb b/app/controllers/enumerations_controller.rb index 2cebc9c5..5749a35e 100644 --- a/app/controllers/enumerations_controller.rb +++ b/app/controllers/enumerations_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index f2c46e76..0114ea84 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/gantts_controller.rb b/app/controllers/gantts_controller.rb index 34e428a9..b5404fc4 100644 --- a/app/controllers/gantts_controller.rb +++ b/app/controllers/gantts_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 1ba5252c..29b642d2 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb index c0a55983..e45d7c9a 100644 --- a/app/controllers/help_controller.rb +++ b/app/controllers/help_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/issue_categories_controller.rb b/app/controllers/issue_categories_controller.rb index 75a2aef5..be7f2b12 100644 --- a/app/controllers/issue_categories_controller.rb +++ b/app/controllers/issue_categories_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/issue_moves_controller.rb b/app/controllers/issue_moves_controller.rb index 98621b0b..7bd46c16 100644 --- a/app/controllers/issue_moves_controller.rb +++ b/app/controllers/issue_moves_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/issue_relations_controller.rb b/app/controllers/issue_relations_controller.rb index a053dbdc..5df990b0 100644 --- a/app/controllers/issue_relations_controller.rb +++ b/app/controllers/issue_relations_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/issue_statuses_controller.rb b/app/controllers/issue_statuses_controller.rb index 3258a289..5eea0f30 100644 --- a/app/controllers/issue_statuses_controller.rb +++ b/app/controllers/issue_statuses_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 71d5077c..51f677d1 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb index 9df0f949..bf217aa6 100644 --- a/app/controllers/journals_controller.rb +++ b/app/controllers/journals_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/ldap_auth_sources_controller.rb b/app/controllers/ldap_auth_sources_controller.rb index 56c5ee8d..33c7a297 100644 --- a/app/controllers/ldap_auth_sources_controller.rb +++ b/app/controllers/ldap_auth_sources_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/mail_handler_controller.rb b/app/controllers/mail_handler_controller.rb index 7301503a..3ec65bce 100644 --- a/app/controllers/mail_handler_controller.rb +++ b/app/controllers/mail_handler_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index a3a3e36b..f3906292 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index af34eb89..6b4efbec 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb index ad70cdd3..b0ae6aa0 100644 --- a/app/controllers/my_controller.rb +++ b/app/controllers/my_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb index c218251c..32e4590b 100644 --- a/app/controllers/news_controller.rb +++ b/app/controllers/news_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/previews_controller.rb b/app/controllers/previews_controller.rb index b863b620..399d63b4 100644 --- a/app/controllers/previews_controller.rb +++ b/app/controllers/previews_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/project_enumerations_controller.rb b/app/controllers/project_enumerations_controller.rb index 027f682d..b3bb09c0 100644 --- a/app/controllers/project_enumerations_controller.rb +++ b/app/controllers/project_enumerations_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 42d098a9..c096c034 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/queries_controller.rb b/app/controllers/queries_controller.rb index 7e1a1a99..e8f6a0a7 100644 --- a/app/controllers/queries_controller.rb +++ b/app/controllers/queries_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb index 8f506510..4d2d72cd 100644 --- a/app/controllers/reports_controller.rb +++ b/app/controllers/reports_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index ad190145..b5abe7a6 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb index 0451cea5..ca3295ca 100644 --- a/app/controllers/roles_controller.rb +++ b/app/controllers/roles_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index 1c6f7a51..bc262772 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb index 94502279..0bf5180b 100644 --- a/app/controllers/settings_controller.rb +++ b/app/controllers/settings_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/sys_controller.rb b/app/controllers/sys_controller.rb index 697d9147..3fce4da0 100644 --- a/app/controllers/sys_controller.rb +++ b/app/controllers/sys_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/time_entry_reports_controller.rb b/app/controllers/time_entry_reports_controller.rb index ab8211b9..02cde03a 100644 --- a/app/controllers/time_entry_reports_controller.rb +++ b/app/controllers/time_entry_reports_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb index 9d174104..e3b64fcc 100644 --- a/app/controllers/timelog_controller.rb +++ b/app/controllers/timelog_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/trackers_controller.rb b/app/controllers/trackers_controller.rb index 8f3fea10..91e265fe 100644 --- a/app/controllers/trackers_controller.rb +++ b/app/controllers/trackers_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 6060e129..c8331622 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb index b8c68c30..b8657081 100644 --- a/app/controllers/versions_controller.rb +++ b/app/controllers/versions_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb index 6266a773..e9479f43 100644 --- a/app/controllers/watchers_controller.rb +++ b/app/controllers/watchers_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb index 750992cc..1b5207a4 100644 --- a/app/controllers/welcome_controller.rb +++ b/app/controllers/welcome_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb index 15717277..c83e972d 100644 --- a/app/controllers/wiki_controller.rb +++ b/app/controllers/wiki_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/wikis_controller.rb b/app/controllers/wikis_controller.rb index 632984da..afc431c7 100644 --- a/app/controllers/wikis_controller.rb +++ b/app/controllers/wikis_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/controllers/workflows_controller.rb b/app/controllers/workflows_controller.rb index 0f9717ff..173f6ec5 100644 --- a/app/controllers/workflows_controller.rb +++ b/app/controllers/workflows_controller.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/account_helper.rb b/app/helpers/account_helper.rb index 052322e8..87f020ce 100644 --- a/app/helpers/account_helper.rb +++ b/app/helpers/account_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb index 1761a10a..82a138a0 100644 --- a/app/helpers/admin_helper.rb +++ b/app/helpers/admin_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 542d3086..1f7d786c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/attachments_helper.rb b/app/helpers/attachments_helper.rb index 99cfca0a..a3220f49 100644 --- a/app/helpers/attachments_helper.rb +++ b/app/helpers/attachments_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/auth_sources_helper.rb b/app/helpers/auth_sources_helper.rb index 6275c767..7a01bbcb 100644 --- a/app/helpers/auth_sources_helper.rb +++ b/app/helpers/auth_sources_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/boards_helper.rb b/app/helpers/boards_helper.rb index e912eab2..570a36b6 100644 --- a/app/helpers/boards_helper.rb +++ b/app/helpers/boards_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/calendars_helper.rb b/app/helpers/calendars_helper.rb index 6da25a4a..dc3045c7 100644 --- a/app/helpers/calendars_helper.rb +++ b/app/helpers/calendars_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/custom_fields_helper.rb b/app/helpers/custom_fields_helper.rb index ba3328bb..fd421bcf 100644 --- a/app/helpers/custom_fields_helper.rb +++ b/app/helpers/custom_fields_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/documents_helper.rb b/app/helpers/documents_helper.rb index 53321488..3ab39110 100644 --- a/app/helpers/documents_helper.rb +++ b/app/helpers/documents_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/enumerations_helper.rb b/app/helpers/enumerations_helper.rb index 69540fbc..fb6d34d4 100644 --- a/app/helpers/enumerations_helper.rb +++ b/app/helpers/enumerations_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/gantt_helper.rb b/app/helpers/gantt_helper.rb index 1d1c439d..5733dd81 100644 --- a/app/helpers/gantt_helper.rb +++ b/app/helpers/gantt_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 5fd99145..c6ac0728 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/issue_categories_helper.rb b/app/helpers/issue_categories_helper.rb index a54c45c1..2dd45cc2 100644 --- a/app/helpers/issue_categories_helper.rb +++ b/app/helpers/issue_categories_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/issue_moves_helper.rb b/app/helpers/issue_moves_helper.rb index a56dc0e9..c6251816 100644 --- a/app/helpers/issue_moves_helper.rb +++ b/app/helpers/issue_moves_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/issue_relations_helper.rb b/app/helpers/issue_relations_helper.rb index 21d9f389..b3e5eded 100644 --- a/app/helpers/issue_relations_helper.rb +++ b/app/helpers/issue_relations_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/issue_statuses_helper.rb b/app/helpers/issue_statuses_helper.rb index 038d5309..335ca485 100644 --- a/app/helpers/issue_statuses_helper.rb +++ b/app/helpers/issue_statuses_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 4063d763..dabac782 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # @@ -213,8 +214,8 @@ module IssuesHelper def send_notification_option content_tag(:p, content_tag(:label, - l(:label_notify_member_plural)) + - hidden_field_tag('send_notification', '0') + + l(:label_notify_member_plural), :for => 'send_notification') + + hidden_field_tag('send_notification', '0', :id => nil) + check_box_tag('send_notification', '1', true)) diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb index e16f7a4c..34a2f51d 100644 --- a/app/helpers/journals_helper.rb +++ b/app/helpers/journals_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/mail_handler_helper.rb b/app/helpers/mail_handler_helper.rb index 27ccbbb6..980ddbd3 100644 --- a/app/helpers/mail_handler_helper.rb +++ b/app/helpers/mail_handler_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb index 9e247020..843b0314 100644 --- a/app/helpers/members_helper.rb +++ b/app/helpers/members_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/messages_helper.rb b/app/helpers/messages_helper.rb index e1a15bcf..e5558eaf 100644 --- a/app/helpers/messages_helper.rb +++ b/app/helpers/messages_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/my_helper.rb b/app/helpers/my_helper.rb index 45ce166f..e9324e57 100644 --- a/app/helpers/my_helper.rb +++ b/app/helpers/my_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/news_helper.rb b/app/helpers/news_helper.rb index 945746fe..fb33ced2 100644 --- a/app/helpers/news_helper.rb +++ b/app/helpers/news_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 6824ea08..cc2b90e7 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb index d468be9a..d65aad61 100644 --- a/app/helpers/queries_helper.rb +++ b/app/helpers/queries_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/reports_helper.rb b/app/helpers/reports_helper.rb index adf66589..934cb547 100644 --- a/app/helpers/reports_helper.rb +++ b/app/helpers/reports_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index a3268dfd..34311bdc 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/roles_helper.rb b/app/helpers/roles_helper.rb index ea9fc9ce..d4156b5c 100644 --- a/app/helpers/roles_helper.rb +++ b/app/helpers/roles_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index 6bc9b1d4..81341755 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # @@ -43,6 +44,7 @@ module SearchHelper options << [l(:label_my_projects), 'my_projects'] unless User.current.memberships.empty? options << [l(:label_and_its_subprojects, @project.name), 'subprojects'] unless @project.nil? || @project.descendants.active.empty? options << [@project.name, ''] unless @project.nil? + label_tag("scope", l(:description_project_scope), :class => "hidden-for-sighted") + select_tag('scope', options_for_select(options, params[:scope].to_s)) if options.size > 1 end diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index 8d06bde8..49ebe341 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/sort_helper.rb b/app/helpers/sort_helper.rb index 4ba2d5d3..f882401d 100644 --- a/app/helpers/sort_helper.rb +++ b/app/helpers/sort_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb index af46e6bb..c4bc80dc 100644 --- a/app/helpers/timelog_helper.rb +++ b/app/helpers/timelog_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/trackers_helper.rb b/app/helpers/trackers_helper.rb index 3816c752..e2e9660f 100644 --- a/app/helpers/trackers_helper.rb +++ b/app/helpers/trackers_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 876175bf..1b117156 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/versions_helper.rb b/app/helpers/versions_helper.rb index a17597f3..1c20971d 100644 --- a/app/helpers/versions_helper.rb +++ b/app/helpers/versions_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index 82180461..c014a154 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/welcome_helper.rb b/app/helpers/welcome_helper.rb index 59085afc..56b8ffb2 100644 --- a/app/helpers/welcome_helper.rb +++ b/app/helpers/welcome_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/wiki_helper.rb b/app/helpers/wiki_helper.rb index b668dfd8..7427df07 100644 --- a/app/helpers/wiki_helper.rb +++ b/app/helpers/wiki_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/helpers/workflows_helper.rb b/app/helpers/workflows_helper.rb index 009ef3e5..b52d6bda 100644 --- a/app/helpers/workflows_helper.rb +++ b/app/helpers/workflows_helper.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/attachment.rb b/app/models/attachment.rb index 43c58e11..8dbae846 100644 --- a/app/models/attachment.rb +++ b/app/models/attachment.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/auth_source.rb b/app/models/auth_source.rb index 6ab8f780..3840f66a 100644 --- a/app/models/auth_source.rb +++ b/app/models/auth_source.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/auth_source_ldap.rb b/app/models/auth_source_ldap.rb index ea1ed3a0..d009ae33 100644 --- a/app/models/auth_source_ldap.rb +++ b/app/models/auth_source_ldap.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/board.rb b/app/models/board.rb index 48acc94f..7feb7c83 100644 --- a/app/models/board.rb +++ b/app/models/board.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/change.rb b/app/models/change.rb index 888d1a21..4e90689e 100644 --- a/app/models/change.rb +++ b/app/models/change.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/changeset.rb b/app/models/changeset.rb index ad26c56a..24e71659 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/comment.rb b/app/models/comment.rb index 48bd34c8..0a52b7fb 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/comment_observer.rb b/app/models/comment_observer.rb index 3ac940b1..cedaba89 100644 --- a/app/models/comment_observer.rb +++ b/app/models/comment_observer.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb index f0946169..7aef8306 100644 --- a/app/models/custom_field.rb +++ b/app/models/custom_field.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/custom_value.rb b/app/models/custom_value.rb index 60a2dce4..e18025dc 100644 --- a/app/models/custom_value.rb +++ b/app/models/custom_value.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/document.rb b/app/models/document.rb index 2c425095..06df9720 100644 --- a/app/models/document.rb +++ b/app/models/document.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/document_category.rb b/app/models/document_category.rb index 6b41c053..c0da2bc9 100644 --- a/app/models/document_category.rb +++ b/app/models/document_category.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/document_category_custom_field.rb b/app/models/document_category_custom_field.rb index b1ea94e6..fc21d647 100644 --- a/app/models/document_category_custom_field.rb +++ b/app/models/document_category_custom_field.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/document_observer.rb b/app/models/document_observer.rb index afb5f66a..66ac3a8a 100644 --- a/app/models/document_observer.rb +++ b/app/models/document_observer.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/enabled_module.rb b/app/models/enabled_module.rb index 93db8cdc..96c09b6f 100644 --- a/app/models/enabled_module.rb +++ b/app/models/enabled_module.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/enumeration.rb b/app/models/enumeration.rb index a1d1e816..d3414f20 100644 --- a/app/models/enumeration.rb +++ b/app/models/enumeration.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/group.rb b/app/models/group.rb index 77b277ad..2e7d3526 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/group_custom_field.rb b/app/models/group_custom_field.rb index f291d913..c787c361 100644 --- a/app/models/group_custom_field.rb +++ b/app/models/group_custom_field.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/issue.rb b/app/models/issue.rb index a4bb6936..cc754014 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/issue_category.rb b/app/models/issue_category.rb index 81e2023e..c1a9c6d2 100644 --- a/app/models/issue_category.rb +++ b/app/models/issue_category.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/issue_custom_field.rb b/app/models/issue_custom_field.rb index e0aab007..53f9d366 100644 --- a/app/models/issue_custom_field.rb +++ b/app/models/issue_custom_field.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/issue_observer.rb b/app/models/issue_observer.rb index 63c50e6d..38d7fd29 100644 --- a/app/models/issue_observer.rb +++ b/app/models/issue_observer.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/issue_priority.rb b/app/models/issue_priority.rb index 20239380..84b751ca 100644 --- a/app/models/issue_priority.rb +++ b/app/models/issue_priority.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/issue_priority_custom_field.rb b/app/models/issue_priority_custom_field.rb index 057d8563..b0ffaab1 100644 --- a/app/models/issue_priority_custom_field.rb +++ b/app/models/issue_priority_custom_field.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/issue_relation.rb b/app/models/issue_relation.rb index e925015d..d899926c 100644 --- a/app/models/issue_relation.rb +++ b/app/models/issue_relation.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/issue_status.rb b/app/models/issue_status.rb index 3f38e7f9..7078237d 100644 --- a/app/models/issue_status.rb +++ b/app/models/issue_status.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/journal.rb b/app/models/journal.rb index c7818d76..1b876f42 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/journal_observer.rb b/app/models/journal_observer.rb index 31d1e6d6..32f17505 100644 --- a/app/models/journal_observer.rb +++ b/app/models/journal_observer.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb index 9ab8a2a2..4686811d 100644 --- a/app/models/mail_handler.rb +++ b/app/models/mail_handler.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/mailer.rb b/app/models/mailer.rb index e58c88ed..2be9de70 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/member.rb b/app/models/member.rb index fbd950d3..b10dfcca 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/member_role.rb b/app/models/member_role.rb index 4f2c41f2..57138ead 100644 --- a/app/models/member_role.rb +++ b/app/models/member_role.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/message.rb b/app/models/message.rb index 498682f0..df1850b6 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/message_observer.rb b/app/models/message_observer.rb index f4605858..59f31a9d 100644 --- a/app/models/message_observer.rb +++ b/app/models/message_observer.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/news.rb b/app/models/news.rb index 59786c96..564f82f5 100644 --- a/app/models/news.rb +++ b/app/models/news.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/news_observer.rb b/app/models/news_observer.rb index ce9f7b99..bbf1c347 100644 --- a/app/models/news_observer.rb +++ b/app/models/news_observer.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/principal.rb b/app/models/principal.rb index cf20e199..00207f5e 100644 --- a/app/models/principal.rb +++ b/app/models/principal.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/project.rb b/app/models/project.rb index 7c3ca1aa..5fe6a8b8 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/project_custom_field.rb b/app/models/project_custom_field.rb index 8e7765fd..5b257b8b 100644 --- a/app/models/project_custom_field.rb +++ b/app/models/project_custom_field.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/query.rb b/app/models/query.rb index 545723e2..72b6d412 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/repository.rb b/app/models/repository.rb index eaf0cdbd..8a761a76 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/repository/bazaar.rb b/app/models/repository/bazaar.rb index 83ba51de..9011e16f 100644 --- a/app/models/repository/bazaar.rb +++ b/app/models/repository/bazaar.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/repository/cvs.rb b/app/models/repository/cvs.rb index ff01138e..7c3cf4db 100644 --- a/app/models/repository/cvs.rb +++ b/app/models/repository/cvs.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/repository/darcs.rb b/app/models/repository/darcs.rb index 7b7d5a5c..f0249eea 100644 --- a/app/models/repository/darcs.rb +++ b/app/models/repository/darcs.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/repository/filesystem.rb b/app/models/repository/filesystem.rb index f8d5416d..37084902 100644 --- a/app/models/repository/filesystem.rb +++ b/app/models/repository/filesystem.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/repository/git.rb b/app/models/repository/git.rb index ae8ecb2d..e38d7e99 100644 --- a/app/models/repository/git.rb +++ b/app/models/repository/git.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/repository/mercurial.rb b/app/models/repository/mercurial.rb index 4b9966b8..27923197 100644 --- a/app/models/repository/mercurial.rb +++ b/app/models/repository/mercurial.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/repository/subversion.rb b/app/models/repository/subversion.rb index bf37ed96..46ced476 100644 --- a/app/models/repository/subversion.rb +++ b/app/models/repository/subversion.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/role.rb b/app/models/role.rb index fee9ef9f..59bd4dbc 100644 --- a/app/models/role.rb +++ b/app/models/role.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/setting.rb b/app/models/setting.rb index 5db7f670..145ee5cc 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb index 4467888c..279ef08c 100644 --- a/app/models/time_entry.rb +++ b/app/models/time_entry.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/time_entry_activity.rb b/app/models/time_entry_activity.rb index 3b89ba21..ced2493f 100644 --- a/app/models/time_entry_activity.rb +++ b/app/models/time_entry_activity.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/time_entry_activity_custom_field.rb b/app/models/time_entry_activity_custom_field.rb index f2dfedc7..afec7ef2 100644 --- a/app/models/time_entry_activity_custom_field.rb +++ b/app/models/time_entry_activity_custom_field.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/time_entry_custom_field.rb b/app/models/time_entry_custom_field.rb index faf88edd..75b61601 100644 --- a/app/models/time_entry_custom_field.rb +++ b/app/models/time_entry_custom_field.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/token.rb b/app/models/token.rb index 5477d952..b3dee08b 100644 --- a/app/models/token.rb +++ b/app/models/token.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/tracker.rb b/app/models/tracker.rb index 0345a7e2..353645f7 100644 --- a/app/models/tracker.rb +++ b/app/models/tracker.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/user.rb b/app/models/user.rb index 2be5eade..c5ecb8e9 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/user_custom_field.rb b/app/models/user_custom_field.rb index 862f1af3..3e77db7e 100644 --- a/app/models/user_custom_field.rb +++ b/app/models/user_custom_field.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb index fac46a1c..5763882e 100644 --- a/app/models/user_preference.rb +++ b/app/models/user_preference.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/version.rb b/app/models/version.rb index 829008b4..cf667258 100644 --- a/app/models/version.rb +++ b/app/models/version.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/version_custom_field.rb b/app/models/version_custom_field.rb index 2e363b23..07c11631 100644 --- a/app/models/version_custom_field.rb +++ b/app/models/version_custom_field.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/watcher.rb b/app/models/watcher.rb index 6d1de688..bc1bed6b 100644 --- a/app/models/watcher.rb +++ b/app/models/watcher.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/wiki.rb b/app/models/wiki.rb index e37e6f4c..65f2f731 100644 --- a/app/models/wiki.rb +++ b/app/models/wiki.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/wiki_content.rb b/app/models/wiki_content.rb index 9023e2e2..88bf4504 100644 --- a/app/models/wiki_content.rb +++ b/app/models/wiki_content.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/wiki_content_observer.rb b/app/models/wiki_content_observer.rb index f72b1c9a..aeb8b587 100644 --- a/app/models/wiki_content_observer.rb +++ b/app/models/wiki_content_observer.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb index d61793e9..16566f05 100644 --- a/app/models/wiki_page.rb +++ b/app/models/wiki_page.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/wiki_redirect.rb b/app/models/wiki_redirect.rb index 1fe25e59..f2423732 100644 --- a/app/models/wiki_redirect.rb +++ b/app/models/wiki_redirect.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/models/workflow.rb b/app/models/workflow.rb index 3cc094ce..cb181bb7 100644 --- a/app/models/workflow.rb +++ b/app/models/workflow.rb @@ -1,3 +1,4 @@ +#-- encoding: UTF-8 #-- copyright # ChiliProject is a project management system. # diff --git a/app/views/activities/index.html.erb b/app/views/activities/index.html.erb index af604a66..173b7509 100644 --- a/app/views/activities/index.html.erb +++ b/app/views/activities/index.html.erb @@ -44,7 +44,7 @@

<%= l(:label_activity) %>

<% @activity.event_types.each do |t| %> <%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %> -<%= link_to(l("label_#{t.singularize}_plural"), {"show_#{t}" => 1, :user_id => params[:user_id]})%> +
<% end %>

<% if @project && @project.descendants.active.any? %> diff --git a/app/views/admin/projects.rhtml b/app/views/admin/projects.rhtml index 229c77ea..423a804a 100644 --- a/app/views/admin/projects.rhtml +++ b/app/views/admin/projects.rhtml @@ -6,9 +6,9 @@ <% form_tag({}, :method => :get) do %>
<%= l(:label_filter_plural) %> - + <%= select_tag 'status', project_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;" %> - + <%= text_field_tag 'name', params[:name], :size => 30 %> <%= submit_tag l(:button_apply), :class => "small", :name => nil %> <%= link_to l(:button_clear), {:controller => 'admin', :action => 'projects'}, :class => 'icon icon-reload' %> diff --git a/app/views/custom_fields/_form.rhtml b/app/views/custom_fields/_form.rhtml index dcaecead..81e519c4 100644 --- a/app/views/custom_fields/_form.rhtml +++ b/app/views/custom_fields/_form.rhtml @@ -79,10 +79,9 @@ function toggle_custom_field_format() {
<% case @custom_field.class.name when "IssueCustomField" %> -
<%=l(:label_tracker_plural)%> <% for tracker in @trackers %> - <%= check_box_tag "custom_field[tracker_ids][]", tracker.id, (@custom_field.trackers.include? tracker) %> <%= h(tracker.name) %> + <%= check_box_tag "custom_field[tracker_ids][]", tracker.id, (@custom_field.trackers.include? tracker), :id => "custom_field_tracker_ids_#{tracker.id}" %> <% end %> <%= hidden_field_tag "custom_field[tracker_ids][]", '' %>
diff --git a/app/views/enumerations/destroy.rhtml b/app/views/enumerations/destroy.rhtml index 657df832..b77fff66 100644 --- a/app/views/enumerations/destroy.rhtml +++ b/app/views/enumerations/destroy.rhtml @@ -3,7 +3,7 @@ <% form_tag({}) do %>

<%= l(:text_enumeration_destroy_question, @enumeration.objects_count) %>

-

<%= l(:text_enumeration_category_reassign_to) %> +

<%= select_tag 'reassign_to_id', ("" + options_from_collection_for_select(@enumerations, 'id', 'name')) %>

diff --git a/app/views/groups/_memberships.html.erb b/app/views/groups/_memberships.html.erb index e5d84a17..46f2d11e 100644 --- a/app/views/groups/_memberships.html.erb +++ b/app/views/groups/_memberships.html.erb @@ -44,6 +44,7 @@ <% if projects.any? %>
<%=l(:label_project_new)%> <% remote_form_for(:membership, :url => { :action => 'edit_membership', :id => @group }) do %> +<%= label_tag "membership_project_id", l(:description_choose_project), :class => "hidden-for-sighted" %> <%= select_tag 'membership[project_id]', options_for_membership_project_select(@group, projects) %>

<%= l(:label_role_plural) %>: <% roles.each do |role| %> diff --git a/app/views/issue_categories/destroy.rhtml b/app/views/issue_categories/destroy.rhtml index 2b61810e..fb169c86 100644 --- a/app/views/issue_categories/destroy.rhtml +++ b/app/views/issue_categories/destroy.rhtml @@ -6,6 +6,7 @@


<% if @categories.size > 0 %> : +<%= label_tag "reassign_to_id", l(:description_issue_category_reassign), :class => "hidden-for-sighted" %> <%= select_tag 'reassign_to_id', options_from_collection_for_select(@categories, 'id', 'name') %>

<% end %>
diff --git a/app/views/issue_moves/new.rhtml b/app/views/issue_moves/new.rhtml index 6f2935e1..f1327ad7 100644 --- a/app/views/issue_moves/new.rhtml +++ b/app/views/issue_moves/new.rhtml @@ -26,17 +26,17 @@ <%= select_tag "new_tracker_id", "" + options_from_collection_for_select(@trackers, "id", "name") %>

- + <%= select_tag('status_id', "" + options_from_collection_for_select(@available_statuses, :id, :name)) %>

- + <%= select_tag('priority_id', "" + options_from_collection_for_select(IssuePriority.all, :id, :name)) %>

- + <%= select_tag('assigned_to_id', content_tag('option', l(:label_no_change_option), :value => '') + content_tag('option', l(:label_nobody), :value => 'none') + options_from_collection_for_select(@target_project.assignable_users, :id, :name)) %> @@ -45,12 +45,12 @@

- + <%= text_field_tag 'start_date', '', :size => 10 %><%= calendar_for('start_date') %>

- + <%= text_field_tag 'due_date', '', :size => 10 %><%= calendar_for('due_date') %>

diff --git a/app/views/issues/bulk_edit.rhtml b/app/views/issues/bulk_edit.rhtml index eceb11b8..61bd7e4a 100644 --- a/app/views/issues/bulk_edit.rhtml +++ b/app/views/issues/bulk_edit.rhtml @@ -10,28 +10,28 @@

- + <%= select_tag('issue[tracker_id]', "" + options_from_collection_for_select(@trackers, :id, :name)) %>

<% if @available_statuses.any? %>

- + <%= select_tag('issue[status_id]', "" + options_from_collection_for_select(@available_statuses, :id, :name)) %>

<% end %>

- + <%= select_tag('issue[priority_id]', "" + options_from_collection_for_select(IssuePriority.all, :id, :name)) %>

- + <%= select_tag('issue[assigned_to_id]', content_tag('option', l(:label_no_change_option), :value => '') + content_tag('option', l(:label_nobody), :value => 'none') + options_from_collection_for_select(@assignables, :id, :name)) %>

<% if @project %>

- + <%= select_tag('issue[category_id]', content_tag('option', l(:label_no_change_option), :value => '') + content_tag('option', l(:label_none), :value => 'none') + options_from_collection_for_select(@project.issue_categories, :id, :name)) %> @@ -40,7 +40,7 @@ <% #TODO: allow editing versions when multiple projects %> <% if @project %>

- + <%= select_tag('issue[fixed_version_id]', content_tag('option', l(:label_no_change_option), :value => '') + content_tag('option', l(:label_none), :value => 'none') + version_options_for_select(@project.shared_versions.open.sort)) %> @@ -48,7 +48,7 @@ <% end %> <% @custom_fields.each do |custom_field| %> -

<%= custom_field_tag_for_bulk_edit('issue', custom_field) %>

+

<% end %> <%= call_hook(:view_issues_bulk_edit_details_bottom, { :issues => @issues }) %> @@ -57,23 +57,23 @@
<% if @project && User.current.allowed_to?(:manage_subtasks, @project) %>

- + <%= text_field_tag 'issue[parent_issue_id]', '', :size => 10 %>

<%= javascript_tag "observeParentIssueField('#{auto_complete_issues_path(:project_id => @project) }')" %> <% end %>

- + <%= text_field_tag 'issue[start_date]', '', :size => 10 %><%= calendar_for('issue_start_date') %>

- + <%= text_field_tag 'issue[due_date]', '', :size => 10 %><%= calendar_for('issue_due_date') %>

<% if Issue.use_field_for_done_ratio? %>

- + <%= select_tag 'issue[done_ratio]', options_for_select([[l(:label_no_change_option), '']] + (0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %>

<% end %> diff --git a/app/views/issues/index.rhtml b/app/views/issues/index.rhtml index 18df5a6b..122b0c06 100644 --- a/app/views/issues/index.rhtml +++ b/app/views/issues/index.rhtml @@ -26,7 +26,7 @@ <%= render :partial => 'queries/columns', :locals => {:query => @query} %> - <%= l(:field_group_by) %> + <%= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect {|c| [c.caption, c.name.to_s]}, @query.group_by)) %> diff --git a/app/views/journals/_notes_form.rhtml b/app/views/journals/_notes_form.rhtml index 2b0a467c..19604510 100644 --- a/app/views/journals/_notes_form.rhtml +++ b/app/views/journals/_notes_form.rhtml @@ -1,4 +1,6 @@ <% form_remote_tag(:url => {}, :html => { :id => "journal-#{@journal.id}-form" }) do %> + + <%= label_tag "notes", l(:description_notes), :class => "hidden-for-sighted" %> <%= text_area_tag :notes, @journal.notes, :class => 'wiki-edit', :rows => (@journal.notes.blank? ? 10 : [[10, @journal.notes.length / 50].max, 100].min) %> <%= call_hook(:view_journals_notes_form_after_notes, { :journal => @journal}) %> diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml index ea485225..553d743d 100644 --- a/app/views/layouts/base.rhtml +++ b/app/views/layouts/base.rhtml @@ -37,7 +37,9 @@