From 7a8889dcc47e89caee29e0b4eecaa5001a7475a3 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 18 Jan 2015 14:51:56 +0100
Subject: [PATCH] meeting cont

---
 app/controllers/meetings_controller.rb | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/controllers/meetings_controller.rb b/app/controllers/meetings_controller.rb
index e6e64a2..8801689 100644
--- a/app/controllers/meetings_controller.rb
+++ b/app/controllers/meetings_controller.rb
@@ -30,7 +30,17 @@ class MeetingsController < ApplicationController
   def show
     m=Meeting.find(params[:id])
     respond_to do |format|
-      format.html {redirect_to m.parent}
+      format.html { 
+        if can?(:show, m.parent)
+        redirect_to m.parent
+        else 
+          if can?(:show, m.neuigkeit) && !m.neuigkeit.nil?
+            redirect_to m.neuigkeit
+            else
+            redirect_to m.parent
+          end
+        end
+      }
       format.js  
       
     end