meeting cont

2015-01-18 14:51:56 +01:00
parent b46e19b466
commit 7a8889dcc4
1 changed files with 11 additions and 1 deletions
--- 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