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

Conflicts: app/assets/javascripts/application.js
2014-02-09 23:07:38 +01:00
parent 825dc23de1 bb8f427f95
commit 98d3032850
13 changed files with 223 additions and 65 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