diff --git a/app/controllers/fetprofiles_controller.rb b/app/controllers/fetprofiles_controller.rb index b429599..1641213 100644 --- a/app/controllers/fetprofiles_controller.rb +++ b/app/controllers/fetprofiles_controller.rb @@ -21,8 +21,8 @@ class FetprofilesController < ApplicationController def show @fetprofile = Fetprofile.find(params[:id]) @gremientabs = Gremium.tabs - @memberships=@fetprofile.memberships.order(:typ) - @memberships<< Membership.new + @memberships=@fetprofile.memberships.order(:typ,:vorname,:nachname) + diff --git a/app/controllers/gremien_controller.rb b/app/controllers/gremien_controller.rb index b2a72da..83385f0 100644 --- a/app/controllers/gremien_controller.rb +++ b/app/controllers/gremien_controller.rb @@ -25,6 +25,8 @@ class GremienController < ApplicationController def show @gremium = Gremium.find(params[:id]) @gremientabs=Gremium.tabs +@memberships=@gremium.memberships.active.includes(:fetprofile).order(:typ,"fetprofiles.vorname","fetprofiles.nachname") + respond_to do |format| format.html # show.html.erb format.json { render json: @gremium } @@ -48,7 +50,7 @@ class GremienController < ApplicationController @gremium = Gremium.find(params[:id]) @memberships=@gremium.memberships.order(:fetprofile_id).active - @memberships<