forked from bofh/fetsite
Merge branch 'master' of https://github.com/andreassteph/fetsite
This commit is contained in:
@@ -17,20 +17,19 @@
|
||||
<div class="span4"><%= f.input :picture, :as=>:file %></div>
|
||||
<div class="span4"> <%= f.input :fetmailalias %></div>
|
||||
</div>
|
||||
<% @fetprofile.memberships.each do |m| %>
|
||||
<%= semantic_fields_for m do |mf| %>
|
||||
<div class="row-fluid">
|
||||
|
||||
<%= f.inputs :for => :memberships do |membership,i| %>
|
||||
<div class="row-fluid">
|
||||
<div class="span1"></div>
|
||||
<%= mf.inputs do %>
|
||||
<div class="span3"><%= mf.input :start, :as=>:date %></div>
|
||||
<div class="span3"><%= mf.input :stop %></div>
|
||||
<div class="span3"><%= mf. input :gremium %></div>
|
||||
<div class="span2"><%= mf.input :typ ,:as=>:radio, :collection=>{"mitglied"=>1, "ersatzmitglied"=>2} %></div>
|
||||
|
||||
<div class="span3"><%= membership.input :start, :as=>:date %></div>
|
||||
<div class="span3"><%= membership.input :stop %></div>
|
||||
<div class="span3"><%= membership. input :gremium %></div>
|
||||
<div class="span2"><%= membership.input :typ ,:as=>:radio, :collection=>{"mitglied"=>1, "ersatzmitglied"=>2} %></div>
|
||||
|
||||
</div> <% end %>
|
||||
<% end %>
|
||||
</div>
|
||||
<% end %>
|
||||
<% end
|
||||
end %>
|
||||
|
||||
<div class="row-fluid">
|
||||
<div class="span12">
|
||||
<%= f.actions do %>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<%= semantic_form_for @membership do |f| %>
|
||||
<%= semantic_form_for [@membership.fetprofile,@membership] do |f| %>
|
||||
<%= f.inputs do %>
|
||||
<%= f.input :gremium, :as=>:radio %>
|
||||
<%= f.input :start %>
|
||||
|
||||
@@ -2,4 +2,4 @@
|
||||
|
||||
<%= render 'form' %>
|
||||
|
||||
<%= link_to 'Back', memberships_path %>
|
||||
<%= link_to 'Back', @membership.fetprofile %>
|
||||
|
||||
Reference in New Issue
Block a user