From e7921358b50e99c1f963199f4597a8753373439d Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sun, 1 Dec 2013 12:39:59 +0100
Subject: [PATCH] Issue #56 fixed

---
 app/controllers/fetprofiles_controller.rb | 4 ++--
 app/controllers/gremien_controller.rb     | 4 +++-
 app/views/fetprofiles/show.html.erb       | 2 +-
 app/views/gremien/show.html.erb           | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

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<<Membership.new
+    @memberships<< Membership.new
 
   end
 
diff --git a/app/views/fetprofiles/show.html.erb b/app/views/fetprofiles/show.html.erb
index 4299954..baba82f 100644
--- a/app/views/fetprofiles/show.html.erb
+++ b/app/views/fetprofiles/show.html.erb
@@ -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)%>
diff --git a/app/views/gremien/show.html.erb b/app/views/gremien/show.html.erb
index c08c3cd..37f51f9 100644
--- a/app/views/gremien/show.html.erb
+++ b/app/views/gremien/show.html.erb
@@ -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 %>