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 a0bbb0b..7060fb2 100644 (file)
--- a/app/models/writing_format.rb
+++ b/app/models/writing_format.rb
@@ -30,10 +30,14 @@ def self.list
   self.enable_list
 end
 
-  def self.enable_list
-    WritingFormat.find(:all).delete_if {|wf|
-      wf.enable? == false
-    }
+  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