Merge branch 'master' of https://github.com/fetsite/fetsite

2014-04-18 13:14:14 +02:00
parent 811e6348b6 63f3b09a5d
commit 749cf1532d
1 changed files with 7 additions and 1 deletions
--- a/app/controllers/neuigkeiten_controller.rb
+++ b/app/controllers/neuigkeiten_controller.rb
@@ -73,6 +73,12 @@ class NeuigkeitenController < ApplicationController
  end
  def find_link
    @rubrik=@neuigkeit.rubrik    
+   if can?(:shownonpublic, Rubrik)
+      @rubriken = Rubrik.all
+    else
+      @rubriken = Rubrik.where(:public=>true)
+    end   
+
    @calentries1=@neuigkeit.calentries
    @nlink_search = Neuigkeit::LINKTYPES.clone