Merge branch 'v06' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06

[pettanr/pettanr.git] / app / models / panel.rb

diff --git a/app/models/panel.rb b/app/models/panel.rb
index 3acafc8..137b2c0 100644 (file)
--- a/app/models/panel.rb
+++ b/app/models/panel.rb
@@ -23,7 +23,7 @@ class Panel < Pettanr::Content
   end
   
   def self.each_element_class_names
-    Pettanr::Application.manifest.system_resources.elements.each do |k, n|
+    Manifest.manifest.system_resources.elements.each do |k, n|
       yield k
     end
   end
@@ -87,13 +87,12 @@ class Panel < Pettanr::Content
   
   def select_tag_attributes(selected, column, opt = {})
     [
-      :last, :first, 
       {:html => {:selected => selected}}, 
       self.field_tag_attributes(column, opt)
     ]
   end
   
-  def field_tag_attributes column, opt = {}
+  def field_tag_attributes column, no_attr, opt = {}
     self.tag_attributes(column).merge(
       {:column => column}
     ).merge(opt)