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

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

diff --git a/app/models/writing_format.rb b/app/models/writing_format.rb
index 88f2016..7060fb2 100644 (file)
--- a/app/models/writing_format.rb
+++ b/app/models/writing_format.rb
@@ -1,22 +1,15 @@
-class WritingFormat < Pettanr::Item
+class WritingFormat < Peta::Template
+  load_manifest
   has_many :speeches
   belongs_to :system_picture
   
   validates :name, :presence => true, :uniqueness => true, :length => {:maximum => 50}
-  validates :classname, :presence => true, :length => {:maximum => 50}
+  validates :module_name, :presence => true, :length => {:maximum => 50}
   validates :caption, :presence => true, :length => {:maximum => 30}
   validates :t, :presence => true, :numericality => {:greater_than_or_equal_to => 0}
   validates :system_picture_id, :presence => true, :numericality => true, :existence => {:both => false}
   validates :settings, :presence => true
   
-def self.list 
-  WritingFormat.find :all
-end
-
-  def self.valid_encode_columns
-    super + ['name', 'classname', 'caption', 'settings']
-  end
-  
   def supply_default
   end
   
@@ -24,26 +17,27 @@ end
     self.t = WritingFormat.count.to_i if self.new_record?
   end
   
-  def self.list_where
-    nil
+  def symbol_option
+    self.system_picture.tmb_opt_img_tag
   end
   
   def self.list_order
     'writing_formats.t asc'
   end
   
-  def self.enable_list
-    WritingFormat.list.delete_if {|wf|
-      wf.enable? == false
-    }
-  end
-  
-  def self.list_opt
-    {}
-  end
-  
-  def self.list_json_opt
-    {}
+#engine vw
+def self.list
+  self.enable_list
+end
+
+  def self.enable_list include_available = false
+    r = WritingFormat.find(:all)
+    unless include_available
+      r.delete_if {|wf|
+        wf.enable? == false
+      }
+    end
+    r
   end
   
   def self.show_opt
@@ -67,25 +61,11 @@ end
     @parsed_settings ||= JSON.parse(self.settings)
   end
   
-  def engine_name
-    Pettanr::Application.manifest.system_resources.writing_formats[self.classname]
-  end
-  
-  def enable?
-    Pettanr::Application.manifest.system_resources.writing_formats.include? self.classname
-  end
-  
-  def engine_module_name
-    self.engine_name.camelize
-  end
-  
-  def engine
-    Object.const_get self.engine_module_name
-  end
-  
-  def engine_model
-    engine.const_get 'Renderer'
-  end
+  # get template model   ex) PettanrSimpleFormat::Renderer
+  # render method written in template model
+  #def extend_model
+  #  self.template_module.const_get 'Renderer'
+  #end
   
   def self.import filename
     WritingFormat.import_file(filename) {|name, attr| WritingFormat.store(name, attr)}