diff --git a/app/controllers/gremien_controller.rb b/app/controllers/gremien_controller.rb index 93c3b42..6ef948b 100644 --- a/app/controllers/gremien_controller.rb +++ b/app/controllers/gremien_controller.rb @@ -33,7 +33,7 @@ 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") + @memberships=@gremium.memberships.visible_in_gremium respond_to do |format| format.html # show.html.erb diff --git a/app/models/membership.rb b/app/models/membership.rb index 272980b..752d91a 100644 --- a/app/models/membership.rb +++ b/app/models/membership.rb @@ -19,6 +19,7 @@ class Membership < ActiveRecord::Base belongs_to :fetprofile belongs_to :gremium scope :active, -> {where("stop >= ? OR stop IS NULL", Time.now.to_date)} + scope :visible_in_gremium, ->{active.includes(:fetprofile).order(:typ,"fetprofiles.vorname","fetprofiles.nachname")} validates :typ, :presence=>true validates :fetprofile, :presence=>true validates :start, :presence=>true diff --git a/app/views/gremien/_nlink.html.erb b/app/views/gremien/_nlink.html.erb index 62535a0..9566d87 100644 --- a/app/views/gremien/_nlink.html.erb +++ b/app/views/gremien/_nlink.html.erb @@ -1,2 +1,6 @@
<%= raw(nlink.desc) %>
+ + <% nlink.memberships.visible_in_gremium.each do |m| %> + <%= image_tag m.fetprofile.try(:picture).try(:thumb) %> + + <% end %>