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

rubrik / Themen -> accessible by

Browse Source
This commit is contained in:
Andreas Stephanides
2015-02-14 17:26:33 +01:00
parent 14ebb13bc1
commit b4683bd396
1 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/controllers/rubriken_controller.rb
View File

@@ -2,13 +2,16 @@ class RubrikenController < ApplicationController
before_filter {@toolbar_elements=[]} before_filter {@toolbar_elements=[]}
load_and_authorize_resource load_and_authorize_resource
def index def index
if can?(:showintern, Rubrik) # if can?(:showintern, Rubrik)
@rubriken = Rubrik.all # @rubriken = Rubrik.all
@neuigkeiten = Neuigkeit.page(params[:page]).per(3) # @neuigkeiten = Neuigkeit.page(params[:page]).per(3)
else # else
@rubriken = Rubrik.where(:public=>true) # @rubriken = Rubrik.where(:public=>true)
@neuigkeiten = Neuigkeit.public.published.page(params[:page]).per(3) # @neuigkeiten = Neuigkeit.public.published.page(params[:page]).per(3)
end # end
@rubriken= Rubrik.accessible_by(current_ability, :show)
@neuigkeiten = Neuigkeit.accessible_by(current_ability, :show).page(params[:page]).per(3)
@calentries= (@rubriken.map {|r| r.calendar}).collect(&:calentries).flatten.select {|c| c.object !=nil} @calentries= (@rubriken.map {|r| r.calendar}).collect(&:calentries).flatten.select {|c| c.object !=nil}
respond_to do |format| respond_to do |format|
@@ -21,20 +24,13 @@ class RubrikenController < ApplicationController
end end
def show def show
if can?(:shownonpublic, Rubrik) @rubriken= Rubrik.accessible_by(current_ability, :show)
@rubriken = Rubrik.all
else
@rubriken = Rubrik.where(:public=>true)
end
@rubrik = Rubrik.find(params[:id]) @rubrik = Rubrik.find(params[:id])
@moderatoren=User.with_role(:newsmoderator,@rubrik) @moderatoren=User.with_role(:newsmoderator,@rubrik)
@calentries= @rubrik.calendar.calentries.select {|c| c.object !=nil} @calentries= @rubrik.calendar.calentries.select {|c| c.object !=nil}
if can?(:showunpublished, Neuigkeit) @neuigkeiten = @rubrik.neuigkeiten.accessible_by(current_ability, :show).page(params[:page]).per(3)
@neuigkeiten = @rubrik.neuigkeiten.page(params[:page]).per(3)
else
@neuigkeiten = @rubrik.neuigkeiten.published.page(params[:page]).per(3)
end
@toolbar_elements << {:text=>I18n.t('neuigkeit.new.title'), :path=> new_rubrik_neuigkeit_path(@rubrik),:hicon=>'icon-plus-sign'} if can? :verwalten, @rubrik @toolbar_elements << {:text=>I18n.t('neuigkeit.new.title'), :path=> new_rubrik_neuigkeit_path(@rubrik),:hicon=>'icon-plus-sign'} if can? :verwalten, @rubrik
@toolbar_elements << {:text=>I18n.t('common.verwalten'), :path=>verwalten_rubrik_path(@rubrik),:icon=>:pencil} if can? :verwalten, @rubrik @toolbar_elements << {:text=>I18n.t('common.verwalten'), :path=>verwalten_rubrik_path(@rubrik),:icon=>:pencil} if can? :verwalten, @rubrik
@@ -47,7 +43,6 @@ class RubrikenController < ApplicationController
def new def new
@rubrik = Rubrik.new @rubrik = Rubrik.new
end end
def edit def edit