andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andreas Stephanides
2014-04-18 13:14:14 +02:00
parent 811e6348b6 63f3b09a5d
commit 749cf1532d
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/neuigkeiten_controller.rb
View File

@@ -73,6 +73,12 @@ class NeuigkeitenController < ApplicationController
end end
def find_link def find_link
@rubrik=@neuigkeit.rubrik @rubrik=@neuigkeit.rubrik
if can?(:shownonpublic, Rubrik)
@rubriken = Rubrik.all
else
@rubriken = Rubrik.where(:public=>true)
end
@calentries1=@neuigkeit.calentries @calentries1=@neuigkeit.calentries
@nlink_search = Neuigkeit::LINKTYPES.clone @nlink_search = Neuigkeit::LINKTYPES.clone
@@ -80,7 +86,7 @@ class NeuigkeitenController < ApplicationController
@nlink_search.collect!{|t| t.search(params[:query]).limit(2)} @nlink_search.collect!{|t| t.search(params[:query]).limit(2)}
@nlink_search.flatten! @nlink_search.flatten!
render action:"show" render action:"show"
end end