now Problem#label returns string include level

diff --git a/app/models/problem.rb b/app/models/problem.rb
index 5713da1..ab933b2 100644 (file)
--- a/app/models/problem.rb
+++ b/app/models/problem.rb
@@ -33,9 +33,8 @@ class Problem < ActiveRecord::Base
   validates_presence_of :options
 
 
-  # TODO remove this method
   def label
-    unit.name
+    "#{unit.name} Lv.#{level}"
   end
 
   def generate

diff --git a/app/views/admin/problems/index.html.erb b/app/views/admin/problems/index.html.erb
index 2046e96..1bf0c7a 100644 (file)
--- a/app/views/admin/problems/index.html.erb
+++ b/app/views/admin/problems/index.html.erb
@@ -7,7 +7,6 @@
     <tr>
       <th>ユニット</th>
       <th>レベル</th>
-      <th>ラベル</th>
       <th>操作</th>
     </tr>
   </thead>
@@ -16,7 +15,6 @@
       <tr>
         <td><%=h problem.unit.name %></td>
         <td><%=h problem.level %></td>
-        <td><%=h problem.label %></td>
         <td>
           <%= link_to _('Show'), admin_problem_path(problem.id) %>
           <%= link_to _('Edit'), edit_admin_problem_path(problem.id) %>