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

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

diff --git a/app/models/speech.rb b/app/models/speech.rb
index 508e816..1cb8403 100644 (file)
--- a/app/models/speech.rb
+++ b/app/models/speech.rb
@@ -8,16 +8,14 @@ class Speech < ActiveRecord::Base
   validates :height, :presence => true, :numericality => true, :natural_number => true
 #  validates :settings, :presence => true
   
-  def visible? au
-    if au == nil
-      return false if MagicNumber['run_mode'] == 1
-    elsif au.is_a?(Author)
-    elsif au.is_a?(Admin)
-      return true
+  def visible? roles
+    if MagicNumber['run_mode'] == 0
+      return false unless guest_role_check(roles)
     else
-      return false
+      return false unless reader_role_check(roles)
     end
-    self.speech_balloon.visible? au
+    return true if self.speech_balloon.panel.own?(roles)
+    self.speech_balloon.panel.visible? roles
   end
   
   def self.default_page_size