Issue #56 fixed
This commit is contained in:
@@ -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)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -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<<Membership.new
|
||||
@memberships<< Membership.new
|
||||
|
||||
end
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
</p>
|
||||
|
||||
<ul>
|
||||
<% @fetprofile.memberships.each do |m| %>
|
||||
<% @memberships.each do |m| %>
|
||||
<li>
|
||||
<%= render m %>
|
||||
<%= link_to I18n.t('common.edit'), edit_fetprofile_membership_path(@fetprofile,m) if params["verwalten"] && can?(:edit, m)%>
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
<% end %>
|
||||
</div>
|
||||
|
||||
<% @gremium.memberships.order(:typ).active.each_slice(4) do |r| %>
|
||||
<% @memberships.each_slice(4) do |r| %>
|
||||
<div class="row-fluid">
|
||||
<% r.each do |m| %>
|
||||
<%= link_to m.fetprofile do %>
|
||||
|
||||
Reference in New Issue
Block a user