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

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

Browse Source
This commit is contained in:
Andreas Stephanides
2015-03-03 20:06:14 +01:00
parent ee69c09aa4 0d6e11299a
commit 6736e4cf04
6 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/ability.rb
View File

@@ -90,7 +90,9 @@ class Ability
#-----------------------------------------------------
# Rechteverwaltung fuer Neuigkeiten
can [:show,:index], Rubrik, :public=>true
can :index, Rubrik
can [:show], Rubrik, :public=>true
can [:list], Neuigkeit, Neuigkeit.public.published
can :show, Neuigkeit, :rubrik=>{:public=>true}
if loggedin
@@ -101,6 +103,7 @@ class Ability
can :showintern, Neuigkeit
can :showintern, Rubrik
can :seeintern, User
can :list, Neuigkeit
can :shownonpublic, Rubrik
can :manage, Nlink
end

3
app/models/neuigkeit.rb
View File

@@ -28,7 +28,8 @@ class Neuigkeit < ActiveRecord::Base
default_scope order(:cache_order)
scope :recent, -> { published.limit(10)}
scope :unpublished, -> {where("datum >= ? OR datum IS NULL", Date.today)}
scope :unpublished, -> {where("datum > ? OR datum IS NULL", Date.today)}
scope :published_scope, ->{where("datum <= ? OR datum IS NULL", Date.today)}
scope :public, ->{includes(:rubrik).where("rubriken.public"=>true)}
scope :intern, ->{includes(:rubrik).where("rubriken.public"=>false)}