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

fetprofile memberships fix

Browse Source
This commit is contained in:
Andreas Stephanides
2013-11-27 15:54:49 +01:00
parent 615f5cc2b7
commit 3ac0ef675b
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/fetprofiles_controller.rb
View File

@@ -21,6 +21,8 @@ class FetprofilesController < ApplicationController
def show def show
@fetprofile = Fetprofile.find(params[:id]) @fetprofile = Fetprofile.find(params[:id])
@gremientabs = Gremium.tabs @gremientabs = Gremium.tabs
@memberships=@fetprofile.memberships.order(:typ)
@memberships<<Membership.new
if params["verwalten"] 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 @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 # GET /fetprofiles/new.json
def new def new
@fetprofile = Fetprofile.new @fetprofile = Fetprofile.new
@memberships=[]; @memberships=[]
@memberships<<Membership.new @memberships<<Membership.new
respond_to do |format| respond_to do |format|
format.html # new.html.erb format.html # new.html.erb
@@ -60,6 +62,8 @@ class FetprofilesController < ApplicationController
# POST /fetprofiles.json # POST /fetprofiles.json
def create def create
@fetprofile = Fetprofile.new(params[:fetprofile]) @fetprofile = Fetprofile.new(params[:fetprofile])
@memberships=@fetprofile.memberships.order(:typ)
@memberships<<Membership.new
respond_to do |format| respond_to do |format|
if @fetprofile.save if @fetprofile.save
@@ -76,6 +80,8 @@ class FetprofilesController < ApplicationController
# PUT /fetprofiles/1.json # PUT /fetprofiles/1.json
def update def update
@fetprofile = Fetprofile.find(params[:id]) @fetprofile = Fetprofile.find(params[:id])
@memberships=@fetprofile.memberships.order(:typ)
@memberships<<Membership.new
respond_to do |format| respond_to do |format|
if @fetprofile.update_attributes(params[:fetprofile]) if @fetprofile.update_attributes(params[:fetprofile])