merge

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

diff --git a/app/models/writing_format.rb b/app/models/writing_format.rb
index 88f2016..5e54402 100644 (file)
--- a/app/models/writing_format.rb
+++ b/app/models/writing_format.rb
@@ -1,4 +1,5 @@
-class WritingFormat < Pettanr::Item
+class WritingFormat < Peta::SystemResource
+  load_manifest
   has_many :speeches
   belongs_to :system_picture
   
@@ -9,14 +10,6 @@ class WritingFormat < Pettanr::Item
   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
   
@@ -32,8 +25,13 @@ end
     'writing_formats.t asc'
   end
   
+#engine vw
+def self.list
+  self.enable_list
+end
+
   def self.enable_list
-    WritingFormat.list.delete_if {|wf|
+    WritingFormat.find(:all).delete_if {|wf|
       wf.enable? == false
     }
   end
@@ -67,12 +65,16 @@ end
     @parsed_settings ||= JSON.parse(self.settings)
   end
   
+  def my_engine_resource
+    Manifest.manifest.system_resources.engine_resources['writing_formats']
+  end
+  
   def engine_name
-    Pettanr::Application.manifest.system_resources.writing_formats[self.classname]
+    self.my_engine_resource.resource_items[self.classname]
   end
   
   def enable?
-    Pettanr::Application.manifest.system_resources.writing_formats.include? self.classname
+    self.my_engine_resource.resource_items.include? self.classname
   end
   
   def engine_module_name