Issue #64 fixed

app/controllers/fetprofiles_controller.rb

@@ -22,7 +22,7 @@ class FetprofilesController < ApplicationController
     @fetprofile = Fetprofile.find(params[:id])
     @gremientabs = Gremium.tabs
     @memberships=@fetprofile.memberships.order(:typ)
-    @memberships<<Membership.new
+    @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
@@ -43,7 +43,7 @@ class FetprofilesController < ApplicationController
   def new
     @fetprofile = Fetprofile.new
     @memberships=[]
-    @memberships<<Membership.new
+    @memberships<< Membership.new
 
     respond_to do |format|
       format.html # new.html.erb
@@ -55,7 +55,7 @@ class FetprofilesController < ApplicationController
   def edit
     @fetprofile = Fetprofile.find(params[:id])
     @memberships=@fetprofile.memberships.order(:typ)
-    @memberships<<Membership.new
+    @memberships<< Membership.new
   end
 
   # POST /fetprofiles
@@ -63,7 +63,7 @@ class FetprofilesController < ApplicationController
   def create
     @fetprofile = Fetprofile.new(params[:fetprofile])
     @memberships=@fetprofile.memberships.order(:typ)
-    @memberships<<Membership.new
+    @memberships<< Membership.new
 
     respond_to do |format|
       if @fetprofile.save
@@ -80,14 +80,16 @@ 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])
         format.html { redirect_to @fetprofile, notice: 'Fetprofile was successfully updated.' }
         format.json { head :no_content }
       else
+        @memberships=@fetprofile.memberships.order(:typ)
+        @memberships<< Membership.new
         format.html { render action: "edit" }
         format.json { render json: @fetprofile.errors, status: :unprocessable_entity }
       end

app/controllers/gremien_controller.rb

@@ -35,6 +35,7 @@ class GremienController < ApplicationController
   # GET /gremien/new.json
   def new
     @gremium = Gremium.new
+    @memberships=[Membership.new]
 
     respond_to do |format|
       format.html # new.html.erb

app/models/fetprofile.rb

@@ -25,10 +25,12 @@ validates :desc, :presence=>true
   validates :vorname, length:{minimum: 3},:presence=>true
   validates :short, length:{minimum: 3},:presence=>true
 
+ accepts_nested_attributes_for :memberships, :reject_if=>lambda{|a| a[:typ].blank?|| a[:start].blank? ||a[:gremium_id].blank?}
+ 
   def name
     [vorname, nachname, "(",short,")"].join(" ")
   end
-  accepts_nested_attributes_for :memberships, :reject_if=>lambda{|a| a[:typ].blank?|| a[:start].blank? ||a[:fetprofile_id].blank?}
+  
   scope :active, -> { where(:active=>true).order(:vorname) } 
   def fetmail
     (fetmailalias.nil? || fetmailalias.empty?) ? short.to_s + "@fet.at" : fetmailalias.to_s + "@fet.at"

app/models/gremium.rb

@@ -17,6 +17,7 @@ class Gremium < ActiveRecord::Base
   ART2FALL={0=>"des", 1=>"des",2=>"der"} # Artikel 2.Fall abhängig vom Geschlecht
   attr_accessible :desc, :name, :typ, :geschlecht,:thema_id, :memberships_attributes
   has_many :memberships # Mitgliedschaften bei dem Gremium
+
   belongs_to :thema # Gehört zu einem Thema
   scope :tabs, -> { where(:typ => [1,3]).order(:typ).order(:name) } # Gremien die in Tabs angezeigt werden (Alle Anderen nur in der Liste
   # Gremium im 2. Fall für die Konstruktion "Mitglied des ... / der ... " 

app/views/fetprofiles/_form.html.erb

@@ -38,7 +38,9 @@
       <div class="span3"><%= membership.input :start, :as=>:datepicker, :prepend=>"von",:label=>false%></div>
       <div class="span3"><%= membership.input :stop, :as=>:datepicker,:label=>false, :prepend =>"bis" %></div>
     <div class="span2"><%= membership.input :typ ,:as=>:select, :collection=>Membership::TYPEN.invert, :label=>false %></div>
- <div class="span3"><%= membership.input :gremium, :label=>false %></div>
+ <div class="span3"><%= membership.input :gremium, :label=>false %>
+
+</div>
 
       
     </div>  

app/views/rubriken/show.html.erb

@@ -33,12 +33,8 @@
 </div>
 
 </div>
-
-
 <br>
-
 <%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
-
 </div>