diff options
| author | tkimia <tkimia@purdue.edu> | 2014-04-28 00:00:57 -0400 |
|---|---|---|
| committer | tkimia <tkimia@purdue.edu> | 2014-04-28 00:00:57 -0400 |
| commit | 7a4832621f1a0bb2e4b86ee9f879a73df0188a3e (patch) | |
| tree | ff049b394ce883e81f2b660687321288b8bf6d3e | |
| parent | 919ba959bbc782315b0a8b171aa96e2118a43067 (diff) | |
| parent | 7a3fe845d568f6eab1e7a55239daed3685797c2e (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
| -rw-r--r-- | app/views/tournaments/_form.html.erb | 44 | ||||
| -rw-r--r-- | lib/sampling/peer_review.rb | 2 |
2 files changed, 23 insertions, 23 deletions
diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb index d89e0bc..2a871ea 100644 --- a/app/views/tournaments/_form.html.erb +++ b/app/views/tournaments/_form.html.erb @@ -54,7 +54,7 @@ <p> <%= f.label :scoring_method %> - <%= f.select(:scoring_method, @tournament.scoring_methods.map{|method| [method.humanize, method]}) %> + <%= f.select(:scoring_method, @tournament.scoring_methods.map{|method| [method.humanize.titleize, method]}) %> </p> <p> @@ -72,27 +72,27 @@ <%= setting_fields.label setting.name %> <br> <% case setting.vartype %> - <% when 0 %> - <%= setting_fields.text_field( setting.name ) %> - <% when 1 %> - <%= setting_fields.text_area( setting.name ) %> - <% when 2 %> - <ul> - <% setting.type_opt.split(',').each do |option|%> - <li><label><%= setting_fields.radio_button( setting.name, option ) %><%= option.humanize %></label></li> - <% end %> - </ul> - <% when 3 %> - <ul> - <% setting.type_opt.split(',').each do |option|%> - <li><label><%= check_box_tag("tournament[settings][#{setting.name}][]", option, setting.value.split(',').include?(option)) %><%= option.humanize %></label></li> - <% end %> - </ul> - <% when 4 %> - <%= setting_fields.radio_button( setting.name, "true" ) %> True - <%= setting_fields.radio_button( setting.name, "false" ) %> False - <% when 5 %> - <%= setting_fields.select( setting.name, setting.type_opt.split(',') ) %> + <% when 0 %> + <%= setting_fields.text_field( setting.name ) %> + <% when 1 %> + <%= setting_fields.text_area( setting.name ) %> + <% when 2 %> + <ul> + <% setting.type_opt.split(',').each do |option|%> + <li><label><%= setting_fields.radio_button( setting.name, option ) %><%= option.humanize %></label></li> + <% end %> + </ul> + <% when 3 %> + <ul> + <% setting.type_opt.split(',').each do |option|%> + <li><label><%= check_box_tag("tournament[settings][#{setting.name}][]", option, setting.value.split(',').include?(option)) %><%= option.humanize %></label></li> + <% end %> + </ul> + <% when 4 %> + <%= setting_fields.radio_button( setting.name, "true" ) %> True + <%= setting_fields.radio_button( setting.name, "false" ) %> False + <% when 5 %> + <%= setting_fields.select( setting.name, setting.type_opt.split(',').collect {|opt| opt.humanize.titleize} ) %> <% end %> </p> <% end %> diff --git a/lib/sampling/peer_review.rb b/lib/sampling/peer_review.rb index cbbd2f9..5ae4e81 100644 --- a/lib/sampling/peer_review.rb +++ b/lib/sampling/peer_review.rb @@ -76,6 +76,6 @@ module Sampling end return ret - endx + end end end |