andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Fetprofile, Gremien etc bearbeitet

Browse Source
This commit is contained in:
Andreas Stephanides
2013-08-21 19:04:26 +02:00
parent faf977e651
commit a4538fa61a
11 changed files with 79 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/controllers/memberships_controller.rb
View File

@@ -1,31 +1,9 @@
class MembershipsController < ApplicationController
# GET /memberships
# GET /memberships.json
def index
@memberships = Membership.all
respond_to do |format|
format.html # index.html.erb
format.json { render json: @memberships }
end
end
# GET /memberships/1
# GET /memberships/1.json
def show
@membership = Membership.find(params[:id])
respond_to do |format|
format.html # show.html.erb
format.json { render json: @membership }
end
end
# GET /memberships/new
# GET /memberships/new.json
def new
@membership = Membership.new
@membership.fetprofile=Fetprofile.find(params[:fetprofile_id])
respond_to do |format|
format.html # new.html.erb
format.json { render json: @membership }
@@ -44,8 +22,8 @@ class MembershipsController < ApplicationController
respond_to do |format|
if @membership.save
format.html { redirect_to @membership, notice: 'Membership was successfully created.' }
format.json { render json: @membership, status: :created, location: @membership }
format.html { redirect_to @membership.fetprofile, notice: 'Membership was successfully created.' }
format.json { render json: @membership.fetprofile, status: :created, location: @membership.fetprofile }
else
format.html { render action: "new" }
format.json { render json: @membership.errors, status: :unprocessable_entity }
@@ -60,7 +38,7 @@ class MembershipsController < ApplicationController
respond_to do |format|
if @membership.update_attributes(params[:membership])
format.html { redirect_to @membership, notice: 'Membership was successfully updated.' }
format.html { redirect_to @membership.fetprofile, notice: 'Membership was successfully updated.' }
format.json { head :no_content }
else
format.html { render action: "edit" }
@@ -73,10 +51,11 @@ class MembershipsController < ApplicationController
# DELETE /memberships/1.json
def destroy
@membership = Membership.find(params[:id])
fp = @membership.fetprofile
@membership.destroy
respond_to do |format|
format.html { redirect_to memberships_url }
format.html { redirect_to fp }
format.json { head :no_content }
end
end