forked from bofh/fetsite
membership gremium scope
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,2 +1,6 @@
|
||||
<h2><%=fa_icon("users 2x")+ nlink.name %></h2>
|
||||
<p><%= raw(nlink.desc) %></p>
|
||||
|
||||
<% nlink.memberships.visible_in_gremium.each do |m| %>
|
||||
<%= image_tag m.fetprofile.try(:picture).try(:thumb) %>
|
||||
|
||||
<% end %>
|
||||
|
||||
Reference in New Issue
Block a user