Issue #56 fixed

This commit is contained in:
Andreas Stephanides
2013-12-01 12:39:59 +01:00
parent 6ea4b94314
commit e7921358b5
4 changed files with 7 additions and 5 deletions

View File

@@ -21,8 +21,8 @@ class FetprofilesController < ApplicationController
def show def show
@fetprofile = Fetprofile.find(params[:id]) @fetprofile = Fetprofile.find(params[:id])
@gremientabs = Gremium.tabs @gremientabs = Gremium.tabs
@memberships=@fetprofile.memberships.order(:typ) @memberships=@fetprofile.memberships.order(:typ,:vorname,:nachname)
@memberships<< Membership.new

View File

@@ -25,6 +25,8 @@ class GremienController < ApplicationController
def show def show
@gremium = Gremium.find(params[:id]) @gremium = Gremium.find(params[:id])
@gremientabs=Gremium.tabs @gremientabs=Gremium.tabs
@memberships=@gremium.memberships.active.includes(:fetprofile).order(:typ,"fetprofiles.vorname","fetprofiles.nachname")
respond_to do |format| respond_to do |format|
format.html # show.html.erb format.html # show.html.erb
format.json { render json: @gremium } format.json { render json: @gremium }
@@ -48,7 +50,7 @@ class GremienController < ApplicationController
@gremium = Gremium.find(params[:id]) @gremium = Gremium.find(params[:id])
@memberships=@gremium.memberships.order(:fetprofile_id).active @memberships=@gremium.memberships.order(:fetprofile_id).active
@memberships<<Membership.new @memberships<< Membership.new
end end

View File

@@ -15,7 +15,7 @@
</p> </p>
<ul> <ul>
<% @fetprofile.memberships.each do |m| %> <% @memberships.each do |m| %>
<li> <li>
<%= render m %> <%= render m %>
<%= link_to I18n.t('common.edit'), edit_fetprofile_membership_path(@fetprofile,m) if params["verwalten"] && can?(:edit, m)%> <%= link_to I18n.t('common.edit'), edit_fetprofile_membership_path(@fetprofile,m) if params["verwalten"] && can?(:edit, m)%>

View File

@@ -14,7 +14,7 @@
<% end %> <% end %>
</div> </div>
<% @gremium.memberships.order(:typ).active.each_slice(4) do |r| %> <% @memberships.each_slice(4) do |r| %>
<div class="row-fluid"> <div class="row-fluid">
<% r.each do |m| %> <% r.each do |m| %>
<%= link_to m.fetprofile do %> <%= link_to m.fetprofile do %>