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

Conflicts: Gemfile.lock
2014-02-20 10:52:49 +01:00
parent 16102fbef6 b910973ee6
commit fce30918a9
4 changed files with 76 additions and 49 deletions
--- a/app/controllers/gremien_controller.rb
+++ b/app/controllers/gremien_controller.rb
@@ -17,7 +17,7 @@ class GremienController < ApplicationController
    if params[:filter].nil?
      @gremien = Gremium.where("CAST(typ AS INT) < 10").order(:typ).order(:name)
    else
-      @gremien = Gremium.order(:typ).order(:name).where("CAST(typ AS INT) == ?",params[:filter])   
+      @gremien = Gremium.order(:typ).order(:name).where("CAST(typ AS INT) = ?",params[:filter].to_i)   
    end