From 3ac0ef675b5b91ed8469d084c050d0585a4cc272 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Wed, 27 Nov 2013 15:54:49 +0100
Subject: [PATCH] fetprofile memberships fix

---
 app/controllers/fetprofiles_controller.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/controllers/fetprofiles_controller.rb b/app/controllers/fetprofiles_controller.rb
index 0a2333e..db7ee18 100644
--- a/app/controllers/fetprofiles_controller.rb
+++ b/app/controllers/fetprofiles_controller.rb
@@ -21,6 +21,8 @@ class FetprofilesController < ApplicationController
   def show
     @fetprofile = Fetprofile.find(params[:id])
     @gremientabs = Gremium.tabs
+    @memberships=@fetprofile.memberships.order(:typ)
+    @memberships<<Membership.new
     
     if params["verwalten"]
       @toolbar_elements << {:hicon=>'icon-plus', :text=> I18n.t('fetprofile.newmembership'),:path => new_fetprofile_membership_path(@fetprofile) , :confirm=>"Sure?" } if can? :new, Membership
@@ -40,8 +42,8 @@ class FetprofilesController < ApplicationController
   # GET /fetprofiles/new.json
   def new
     @fetprofile = Fetprofile.new
-@memberships=[];
-@memberships<<Membership.new
+    @memberships=[]
+    @memberships<<Membership.new
 
     respond_to do |format|
       format.html # new.html.erb
@@ -60,6 +62,8 @@ class FetprofilesController < ApplicationController
   # POST /fetprofiles.json
   def create
     @fetprofile = Fetprofile.new(params[:fetprofile])
+    @memberships=@fetprofile.memberships.order(:typ)
+    @memberships<<Membership.new
 
     respond_to do |format|
       if @fetprofile.save
@@ -76,6 +80,8 @@ class FetprofilesController < ApplicationController
   # PUT /fetprofiles/1.json
   def update
     @fetprofile = Fetprofile.find(params[:id])
+    @memberships=@fetprofile.memberships.order(:typ)
+    @memberships<<Membership.new
 
     respond_to do |format|
       if @fetprofile.update_attributes(params[:fetprofile])