membership form fix
This commit is contained in:
@@ -19,7 +19,7 @@ class MembershipsController < ApplicationController
|
|||||||
# POST /memberships.json
|
# POST /memberships.json
|
||||||
def create
|
def create
|
||||||
@membership = Membership.new(params[:membership])
|
@membership = Membership.new(params[:membership])
|
||||||
@membership.fetprofile= Fetprofle.find(params[:fetprofile_id])
|
@membership.fetprofile= Fetprofile.find(params[:fetprofile_id])
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
if @membership.save
|
if @membership.save
|
||||||
format.html { redirect_to @membership.fetprofile, notice: 'Membership was successfully created.' }
|
format.html { redirect_to @membership.fetprofile, notice: 'Membership was successfully created.' }
|
||||||
|
|||||||
@@ -15,12 +15,13 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
class Fetprofile < ActiveRecord::Base
|
class Fetprofile < ActiveRecord::Base
|
||||||
attr_accessible :active, :desc, :fetmailalias, :nachname, :picture, :short, :vorname
|
attr_accessible :active, :desc, :fetmailalias, :nachname, :picture, :short, :vorname,:memberships_attributes
|
||||||
has_many :memberships
|
has_many :memberships
|
||||||
has_many :gremien, :through=> :membership
|
has_many :gremien, :through=> :membership
|
||||||
mount_uploader :picture, PictureUploader
|
mount_uploader :picture, PictureUploader
|
||||||
def name
|
def name
|
||||||
[vorname, nachname, "(",short,")"].join(" ")
|
[vorname, nachname, "(",short,")"].join(" ")
|
||||||
end
|
end
|
||||||
|
accepts_nested_attributes_for :memberships
|
||||||
scope :active, -> { where(:active=>:true).order(:vorname) }
|
scope :active, -> { where(:active=>:true).order(:vorname) }
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -17,20 +17,19 @@
|
|||||||
<div class="span4"><%= f.input :picture, :as=>:file %></div>
|
<div class="span4"><%= f.input :picture, :as=>:file %></div>
|
||||||
<div class="span4"> <%= f.input :fetmailalias %></div>
|
<div class="span4"> <%= f.input :fetmailalias %></div>
|
||||||
</div>
|
</div>
|
||||||
<% @fetprofile.memberships.each do |m| %>
|
|
||||||
<%= semantic_fields_for m do |mf| %>
|
<%= f.inputs :for => :memberships do |membership,i| %>
|
||||||
<div class="row-fluid">
|
<div class="row-fluid">
|
||||||
<div class="span1"></div>
|
<div class="span1"></div>
|
||||||
<%= mf.inputs do %>
|
|
||||||
<div class="span3"><%= mf.input :start, :as=>:date %></div>
|
<div class="span3"><%= membership.input :start, :as=>:date %></div>
|
||||||
<div class="span3"><%= mf.input :stop %></div>
|
<div class="span3"><%= membership.input :stop %></div>
|
||||||
<div class="span3"><%= mf. input :gremium %></div>
|
<div class="span3"><%= membership. input :gremium %></div>
|
||||||
<div class="span2"><%= mf.input :typ ,:as=>:radio, :collection=>{"mitglied"=>1, "ersatzmitglied"=>2} %></div>
|
<div class="span2"><%= membership.input :typ ,:as=>:radio, :collection=>{"mitglied"=>1, "ersatzmitglied"=>2} %></div>
|
||||||
|
|
||||||
|
</div> <% end %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
|
||||||
<% end %>
|
|
||||||
<% end
|
|
||||||
end %>
|
|
||||||
<div class="row-fluid">
|
<div class="row-fluid">
|
||||||
<div class="span12">
|
<div class="span12">
|
||||||
<%= f.actions do %>
|
<%= 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.inputs do %>
|
||||||
<%= f.input :gremium, :as=>:radio %>
|
<%= f.input :gremium, :as=>:radio %>
|
||||||
<%= f.input :start %>
|
<%= f.input :start %>
|
||||||
|
|||||||
@@ -2,4 +2,4 @@
|
|||||||
|
|
||||||
<%= render 'form' %>
|
<%= render 'form' %>
|
||||||
|
|
||||||
<%= link_to 'Back', memberships_path %>
|
<%= link_to 'Back', @membership.fetprofile %>
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
Fetsite::Application.routes.draw do
|
Fetsite::Application.routes.draw do
|
||||||
|
|
||||||
devise_for :users
|
devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" }
|
||||||
resources :home, :only=>[:index]
|
resources :home, :only=>[:index]
|
||||||
#get 'home',:controller=>home,:action=>:index,:as=>"home_index"
|
#get 'home',:controller=>home,:action=>:index,:as=>"home_index"
|
||||||
scope '(:locale)/admin' do
|
scope '(:locale)/admin' do
|
||||||
@@ -39,10 +39,10 @@
|
|||||||
resources :galleries do
|
resources :galleries do
|
||||||
resources :fotos
|
resources :fotos
|
||||||
end
|
end
|
||||||
resources :memberships, :except=>[:new, :show, :edit]
|
|
||||||
resources :gremien
|
resources :gremien
|
||||||
resources :fetprofiles do
|
resources :fetprofiles do
|
||||||
resources :memberships, :only=>[:new, :show, :edit]
|
resources :memberships
|
||||||
end
|
end
|
||||||
resources :lecturers
|
resources :lecturers
|
||||||
resources :semesters
|
resources :semesters
|
||||||
|
|||||||
Reference in New Issue
Block a user