abilities und beispiel delete

2014-07-16 00:24:34 +05:30
parent 3291ca364b
commit 6c92fd8607
7 changed files with 57 additions and 56 deletions
--- a/app/controllers/rubriken_controller.rb
+++ b/app/controllers/rubriken_controller.rb
@@ -2,13 +2,15 @@ class RubrikenController < ApplicationController
  before_filter {@toolbar_elements=[]}
   load_and_authorize_resource
  def index
-    if can?(:shownonpublic, Rubrik)
+    if can?(:showintern, Rubrik)
      @rubriken = Rubrik.all
+      @neuigkeiten = Neuigkeit.recent
    else
      @rubriken = Rubrik.where(:public=>true)
+      @neuigkeiten = Neuigkeit.public.recent
    end   
-    @neuigkeiten = @rubriken.collect(&:neuigkeiten).map(&:recent).flatten
-    @calentries= @rubriken.collect(&:calentries).flatten
+    
+      @calentries= @rubriken.collect(&:calentries).flatten
  end
  def intern