summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2012-10-29 10:19:40 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2012-10-29 10:19:40 +0000
commit5fe4aae7ba627d80f877a5fc126fe059691edd31 (patch)
tree90804924613d4c0fb545d13f584891b9d2c71035
parent6b2e0333ca44a8e94267932ec7021abded980684 (diff)
downloadredmine-5fe4aae7ba627d80f877a5fc126fe059691edd31.tar.gz
redmine-5fe4aae7ba627d80f877a5fc126fe059691edd31.zip
Non working days is an array of strings (#2161).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10749 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/views/settings/_issues.html.erb2
-rw-r--r--config/settings.yml4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/settings/_issues.html.erb b/app/views/settings/_issues.html.erb
index dcf5df86e..c72358577 100644
--- a/app/views/settings/_issues.html.erb
+++ b/app/views/settings/_issues.html.erb
@@ -13,7 +13,7 @@
<p><%= setting_select :issue_done_ratio, Issue::DONE_RATIO_OPTIONS.collect {|i| [l("setting_issue_done_ratio_#{i}"), i]} %></p>
-<p><%= setting_multiselect :non_working_week_days, (1..7).map {|d| [day_name(d), d]}, :inline => true %></p>
+<p><%= setting_multiselect :non_working_week_days, (1..7).map {|d| [day_name(d), d.to_s]}, :inline => true %></p>
<p><%= setting_text_field :issues_export_limit, :size => 6 %></p>
diff --git a/config/settings.yml b/config/settings.yml
index 130e26346..83c0d86e4 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -223,5 +223,5 @@ thumbnails_size:
non_working_week_days:
serialized: true
default:
- - 6
- - 7
+ - '6'
+ - '7'