t#30137:fix authenticate

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

diff --git a/app/models/balloon.rb b/app/models/balloon.rb
index 14143a6..84604bf 100644 (file)
--- a/app/models/balloon.rb
+++ b/app/models/balloon.rb
@@ -15,16 +15,14 @@ class Balloon < ActiveRecord::Base
     '/system_pictures/' + self.system_picture.filename
   end
   
-  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