fix bugs

diff --git a/app/views/admin/problems/#_ordinary_arithmetic.html.erb# b/app/views/admin/problems/#_ordinary_arithmetic.html.erb#
new file mode 100644 (file)
index 0000000..f5c1baf
--- /dev/null
+++ b/app/views/admin/problems/#_ordinary_arithmetic.html.erb#
@@ -0,0 +1,5 @@
+<table class="problem">
+  <%= render :partial => "common" %>
+  <%= render :partial => "operators", :locals => { :operators => %w[plus minus times div], :term_number => true } %>
+  <%= render :partial => "minus_min_max", :locals => { :prefix => "", :minus => true } %>
+</table>

diff --git a/app/views/admin/problems/.#_ordinary_arithmetic.html.erb b/app/views/admin/problems/.#_ordinary_arithmetic.html.erb
new file mode 120000 (symlink)
index 0000000..51406f6
--- /dev/null
+++ b/app/views/admin/problems/.#_ordinary_arithmetic.html.erb
@@ -0,0 +1 @@
+kenji@suzaku.2402:1267227519
\ No newline at end of file

diff --git a/app/views/admin/problems/_complex_fractional_arithmetic.html.erb b/app/views/admin/problems/_complex_fractional_arithmetic.html.erb
index 653d2e8..0746c65 100644 (file)
--- a/app/views/admin/problems/_complex_fractional_arithmetic.html.erb
+++ b/app/views/admin/problems/_complex_fractional_arithmetic.html.erb
@@ -1,6 +1,6 @@
 <table class="problem">
   <%= render :partial => "common" %>
-  <%= render :partial => "operators", :locals => { :operators => %w[plus minus times] } %>
+  <%= render :partial => "operators", :locals => { :operators => %w[plus minus times], :term_number => false } %>
   <%= render :partial => "minus_min_max", :locals => { :prefix => "numerator_term_", :minus => false } %>
   <%= render :partial => "minus_min_max", :locals => { :prefix => "denominator_term_", :minus => false } %>
 </table>

diff --git a/app/views/admin/problems/_complex_fractional_arithmetic_edit_form.html.erb b/app/views/admin/problems/_complex_fractional_arithmetic_edit_form.html.erb
index 17ddecf..69a705c 100644 (file)
--- a/app/views/admin/problems/_complex_fractional_arithmetic_edit_form.html.erb
+++ b/app/views/admin/problems/_complex_fractional_arithmetic_edit_form.html.erb
@@ -1,6 +1,6 @@
 <table class="problem">
-  <%= render :partial => "common_edit_form" %>
-  <%= render :partial => "operators_edit_form", :locals => { :f => f, :operators => %w[plus minus times] } %>
+  <%= render :partial => "common_edit_form", :locals => { :f => f } %>
+  <%= render :partial => "operators_edit_form", :locals => { :f => f, :operators => %w[plus minus times], :term_number => false } %>
   <%= render :partial => "minus_min_max_edit_form", :locals => { :f => f, :prefix => "numerator_term_", :minus => false } %>
   <%= render :partial => "minus_min_max_edit_form", :locals => { :f => f, :prefix => "denominator_term_", :minus => false } %>
 </table>

diff --git a/app/views/admin/problems/_complex_number_arithmetic.html.erb b/app/views/admin/problems/_complex_number_arithmetic.html.erb
index bcb88b9..b6881a5 100644 (file)
--- a/app/views/admin/problems/_complex_number_arithmetic.html.erb
+++ b/app/views/admin/problems/_complex_number_arithmetic.html.erb
@@ -1,6 +1,6 @@
 <table class="problem">
   <%= render :partial => "common" %>
-  <%= render :partial => "operators", :locals => { :operators => %w[plus minus times fraction] } %>
+  <%= render :partial => "operators", :locals => { :operators => %w[plus minus times fraction], :term_number => true } %>
   <%= render :partial => "minus_min_max", :locals => { :prefix => "", :minus => false } %>
   <tr><th><%= _("Fractional mode") %></th><td><%= check_box_tag "", "1", @form.fractional_mode %></td></tr>
 </table>

diff --git a/app/views/admin/problems/_complex_number_arithmetic_edit_form.html.erb b/app/views/admin/problems/_complex_number_arithmetic_edit_form.html.erb
index 9cda35b..40a565c 100644 (file)
--- a/app/views/admin/problems/_complex_number_arithmetic_edit_form.html.erb
+++ b/app/views/admin/problems/_complex_number_arithmetic_edit_form.html.erb
@@ -1,6 +1,6 @@
 <table class="problem">
-  <%= render :partial => "common_edit_form" %>
-  <%= render :partial => "operators_edit_form", :locals => { :f => f, :operators => %w[plus minus times fraction] } %>
+  <%= render :partial => "common_edit_form", :locals => { :f => f } %>
+  <%= render :partial => "operators_edit_form", :locals => { :f => f, :operators => %w[plus minus times fraction], :term_number => true } %>
   <%= render :partial => "minus_min_max_edit_form", :locals => { :f => f, :prefix => "", :minus => false } %>
   <tr><th><%= f.label(:fractional_mode) %></th><td><%= f.check_box(:fractional_mode) %></td></tr>
 </table>

diff --git a/app/views/admin/problems/_decimal_arithmetic.html.erb b/app/views/admin/problems/_decimal_arithmetic.html.erb
index 0753560..8260859 100644 (file)
--- a/app/views/admin/problems/_decimal_arithmetic.html.erb
+++ b/app/views/admin/problems/_decimal_arithmetic.html.erb
@@ -1,6 +1,6 @@
 <table class="problem">
   <%= render :partial => "common" %>
-  <%= render :partial => "operators", :locals => { :operators => %w[plus minus times div] } %>
+  <%= render :partial => "operators", :locals => { :operators => %w[plus minus times div], :term_number => true } %>
   <tr><th><%= _("Minus") %></th><td><%= check_box_tag "minus", "1", @form.minus %></td></tr>
   <tr><th><%= _("Digits") %></th><td><%= @form.digits %></td></tr>
   <%= render :partial => "minus_min_max", :locals => { :prefix => "", :minus => false } %>

diff --git a/app/views/admin/problems/_decimal_arithmetic_edit_form.html.erb b/app/views/admin/problems/_decimal_arithmetic_edit_form.html.erb
index 114e546..a51aa5b 100644 (file)
--- a/app/views/admin/problems/_decimal_arithmetic_edit_form.html.erb
+++ b/app/views/admin/problems/_decimal_arithmetic_edit_form.html.erb
@@ -1,6 +1,6 @@
 <table class="problem">
   <%= render :partial => "common_edit_form", :locals => { :f => f } %>
-  <%= render :partial => "operators_edit_form", :locals => { :f => f, :operators => %w[plus minus times div] } %>
+  <%= render :partial => "operators_edit_form", :locals => { :f => f, :operators => %w[plus minus times div], :term_number => true } %>
   <tr><th><%= f.label(:minus, _("Minus")) %></th><td><%= f.check_box(:minus) %></td></tr>
   <tr><th><%= f.label(:digits, _("Digits")) %></th><td><%= f.text_field(:digits) %></td></tr>
   <%= render :partial => "minus_min_max_edit_form", :locals => { :f => f, :prefix => "", :minus => false } %>

diff --git a/app/views/admin/problems/_factorial_expression.html.erb b/app/views/admin/problems/_factorial_expression.html.erb
index 0b38252..cc77723 100644 (file)
--- a/app/views/admin/problems/_factorial_expression.html.erb
+++ b/app/views/admin/problems/_factorial_expression.html.erb
@@ -1,6 +1,6 @@
 <table class="problem">
   <%= render :partial => "common" %>
-  <%= render :partial => "operatos", :locals => { :operators => %w[plus minus times div] } %>
+  <%= render :partial => "operatos", :locals => { :operators => %w[plus minus times div], :term_number => true } %>
   <%= render :partial => "minus_min_max", :locals => { :prefix => "numerator_term_number_", :minus => false } %>
   <%= render :partial => "minus_min_max", :locals => { :prefix => "denominator_term_number_", :minus => false } %>
   <tr><th><%= _("x") %></th><td><%=h @form.x %></td></tr>

diff --git a/app/views/admin/problems/_factorial_expression_edit_form.html.erb b/app/views/admin/problems/_factorial_expression_edit_form.html.erb
index c19c45a..f089a88 100644 (file)
--- a/app/views/admin/problems/_factorial_expression_edit_form.html.erb
+++ b/app/views/admin/problems/_factorial_expression_edit_form.html.erb
@@ -1,6 +1,6 @@
 <table class="problem">
   <%= render :partial => "common_edit_form", :locals => { :f => f } %>
-  <%= render :partial => "operators_edit_form", :locals => { :f => f, :operators => %w[plus minus times div]  } %>
+  <%= render :partial => "operators_edit_form", :locals => { :f => f, :operators => %w[plus minus times div], :term_number => true } %>
   <%= render :partial => "minus_min_max_edit_form", :locals => { :f => f, :prefix => "numerator_term_number_", :minus => false } %>
   <%= render :partial => "minus_min_max_edit_form", :locals => { :f => f, :prefix => "denominator_term_number_", :minus => false } %>
   <tr><th><%= f.label(:x) %></th><td><%= f.text_field(:x) %></td></tr>

diff --git a/app/views/admin/problems/_fractional_arithmetic.html.erb b/app/views/admin/problems/_fractional_arithmetic.html.erb
index c657cf5..5b4d993 100644 (file)
--- a/app/views/admin/problems/_fractional_arithmetic.html.erb
+++ b/app/views/admin/problems/_fractional_arithmetic.html.erb
@@ -1,6 +1,6 @@
 <table class="problem">
   <%= render :partial => "common" %>
-  <%= render :partial => "operators", :locals => { :operators => %w[plus minus times div] } %>
+  <%= render :partial => "operators", :locals => { :operators => %w[plus minus times div], :term_number => true } %>
   <tr><th><%= _("Minus") %></th><td><%= check_box_tag "minus", "1", @form.minus %></td></tr>
   <%= render :partial => "minus_min_max", :locals => { :prefix => "numerator", :minus => false } %>
   <%= render :partial => "minus_min_max", :locals => { :prefix => "denominator", :minus => false } %>

diff --git a/app/views/admin/problems/_fractional_arithmetic_edit_form.html.erb b/app/views/admin/problems/_fractional_arithmetic_edit_form.html.erb
index d8039cf..9c822a9 100644 (file)
--- a/app/views/admin/problems/_fractional_arithmetic_edit_form.html.erb
+++ b/app/views/admin/problems/_fractional_arithmetic_edit_form.html.erb
@@ -1,6 +1,6 @@
 <table class="problem">
   <%= render :partial => "common_edit_form", :locals => { :f => f } %>
-  <%= render :partial => "operators_edit_form", :locals => { :f => f, :operators => %w[plus minus times div] } %>
+  <%= render :partial => "operators_edit_form", :locals => { :f => f, :operators => %w[plus minus times div], :term_number => true } %>
   <tr><th><%= f.label(:minus, _("Minus")) %></th><td><%= f.check_box(:minus) %></td></tr>
   <%= render :partial => "minus_min_max_edit_form", :locals => { :f => f, :prefix => "numerator_", :minus => false } %>
   <%= render :partial => "minus_min_max_edit_form", :locals => { :f => f, :prefix => "denominator_", :minus => false } %>

diff --git a/app/views/admin/problems/_operators.html.erb b/app/views/admin/problems/_operators.html.erb
index a50e5f1..f1e1657 100644 (file)
--- a/app/views/admin/problems/_operators.html.erb
+++ b/app/views/admin/problems/_operators.html.erb
@@ -9,4 +9,6 @@
     </ul>
   </td>
 </tr>
+<%- if term_number -%>
 <tr><th><%= _("Term number") %></th><td><%= @form.term_number %></td></tr>
+<%- end -%>

diff --git a/app/views/admin/problems/_operators_edit_form.html.erb b/app/views/admin/problems/_operators_edit_form.html.erb
index 0c18b3e..4b1f297 100644 (file)
--- a/app/views/admin/problems/_operators_edit_form.html.erb
+++ b/app/views/admin/problems/_operators_edit_form.html.erb
@@ -9,4 +9,6 @@
     </ul>
   </td>
 </tr>
+<%- if term_number -%>
 <tr><th><%= f.label(:term_number) %></th><td><%= f.text_field(:term_number) %></td></tr>
+<%- end -%>

diff --git a/app/views/admin/problems/_ordinary_arithmetic_edit_form.html.erb b/app/views/admin/problems/_ordinary_arithmetic_edit_form.html.erb
index 3ed881a..48bbc88 100644 (file)
--- a/app/views/admin/problems/_ordinary_arithmetic_edit_form.html.erb
+++ b/app/views/admin/problems/_ordinary_arithmetic_edit_form.html.erb
@@ -1,5 +1,5 @@
 <table class="problem">
   <%= render :partial => "common_edit_form", :locals => { :f => f } %>
-  <%= render :partial => "operators_edit_form", :locals => { :f => f, :operators => %w[plus minus times div] } %>
+  <%= render :partial => "operators_edit_form", :locals => { :f => f, :operators => %w[plus minus times div], :term_number => true } %>
   <%= render :partial => "minus_min_max_edit_form", :locals => { :f => f, :prefix => "", :minus => true } %>
 </table>

diff --git a/app/views/admin/problems/_square_root_arithmetic.html.erb b/app/views/admin/problems/_square_root_arithmetic.html.erb
index 1699f05..e744d4d 100644 (file)
--- a/app/views/admin/problems/_square_root_arithmetic.html.erb
+++ b/app/views/admin/problems/_square_root_arithmetic.html.erb
@@ -1,6 +1,6 @@
 <table class="problem">
   <%= render :partial => "common" %>
-  <%= render :partial => "operators", :locals => { :operators => %w[plus minus] } %>
+  <%= render :partial => "operators", :locals => { :operators => %w[plus minus], :term_number => true } %>
   <%= render :partial => "minus_min_max", :locals => { :prefix => "", :minus => false } %>
   <%= render :partial => "minus_min_max", :locals => { :prefix => "single_term_", :minus => false } %>
   <tr><th><%= _("Use coefficient") %></th><td><%= check_box_tag "", "1", @form.use_coefficient %></td></tr>

diff --git a/app/views/admin/problems/_square_root_arithmetic_edit_form.html.erb b/app/views/admin/problems/_square_root_arithmetic_edit_form.html.erb
index 3139527..e1b5695 100644 (file)
--- a/app/views/admin/problems/_square_root_arithmetic_edit_form.html.erb
+++ b/app/views/admin/problems/_square_root_arithmetic_edit_form.html.erb
@@ -1,6 +1,6 @@
 <table class="problem">
   <%= render :partial => "common_edit_form", :locals => { :f => f } %>
-  <%= render :partial => "operators_edit_form", :locals => { :f => f, :operators => %w[plus minus] } %>
+  <%= render :partial => "operators_edit_form", :locals => { :f => f, :operators => %w[plus minus], :term_number => true } %>
   <%= render :partial => "minus_min_max_edit_form", :locals => { :f => f, :prefix => "", :minus => false } %>
   <%= render :partial => "minus_min_max_edit_form", :locals => { :f => f, :prefix => "single_term_", :minus => false } %>
   <tr><th><%= f.label(:use_coefficient) %></th><td><%= f.check_box(:use_coefficient) %></td></tr>

diff --git a/app/views/admin/problems/new.html.erb b/app/views/admin/problems/new.html.erb
index ae48c2d..6d7d497 100644 (file)
--- a/app/views/admin/problems/new.html.erb
+++ b/app/views/admin/problems/new.html.erb
@@ -5,7 +5,7 @@
 <div id="tabs">
   <ul>
     <%- @units.each do |unit| -%>
-      <li><%= link_to _(unit.humanize), new_admin_problem_path(:unit => unit) %></li>
+      <li><%= link_to unit.name, new_admin_problem_path(:unit_id => unit.id) %></li>
     <%- end -%>
   </ul>
 </div>

diff --git a/app/views/admin/problems/new_form.html.erb b/app/views/admin/problems/new_form.html.erb
index 63e21a5..b4449a5 100644 (file)
--- a/app/views/admin/problems/new_form.html.erb
+++ b/app/views/admin/problems/new_form.html.erb
@@ -1,6 +1,6 @@
 <%- form_for :problem, @form, :url => admin_problems_path do |f| -%>
   <p><%= f.error_messages %></p>
-  <%= render :partial => "#{@form.unit}_edit_form", :locals => { :f => f } %>
+  <%= render :partial => @form.unit.form_template, :locals => { :f => f } %>
   <div>
     <%= f.hidden_field(:unit_id) %>
     <%= f.hidden_field(:lock_version) %>