Merge branch 'testgallery'

2015-01-17 12:18:14 +01:00
parent edc8f6c2e3 3c2250b4fc
commit e93b9b7342
21 changed files with 265 additions and 164 deletions
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -2,8 +2,12 @@ class HomeController < ApplicationController
  def index
    @beispiele = Beispiel.last([Beispiel.count, 3].min)
    @neuigkeiten = Neuigkeit.recent
+    if Thema.count>0
    t=YAML.load_file("#{::Rails.root.to_s}/config/start_topic.yml")
    @starttopic= @themen = Thema.where(:id=>t).first
+    else
+      @starttopic=@themen = nil
+    end
  end
  def dev