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

Conflicts: app/views/neuigkeiten/_form.html.erb
2015-05-28 20:16:33 +02:00
parent 7c668809dc eee8248c0f
commit c7e6c5022b
4 changed files with 12 additions and 9 deletions
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -1,7 +1,7 @@
 class HomeController < ApplicationController
  def index
    @beispiele = Beispiel.last([Beispiel.count, 3].min)
-    @neuigkeiten = Neuigkeit.recent
+    @neuigkeiten = Neuigkeit.accessible_by(current_ability, :show).limit(10)
    if Thema.count>0
    t=YAML.load_file("#{::Rails.root.to_s}/config/start_topic.yml")
    @rubriken= Rubrik.accessible_by(current_ability, :show)