From 6ea4b9431436ea5929cb8c97f5cd446e81291522 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Sun, 1 Dec 2013 12:31:06 +0100 Subject: [PATCH] Issue #55 fixed --- app/controllers/fetprofiles_controller.rb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/controllers/fetprofiles_controller.rb b/app/controllers/fetprofiles_controller.rb index 1af7028..b429599 100644 --- a/app/controllers/fetprofiles_controller.rb +++ b/app/controllers/fetprofiles_controller.rb @@ -24,14 +24,13 @@ class FetprofilesController < ApplicationController @memberships=@fetprofile.memberships.order(:typ) @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 - @toolbar_elements << {:hicon=>'icon-pencil', :text=> I18n.t('common.edit'),:path => edit_fetprofile_path(@fetprofile),:confirm=>"Sure?" } if can? :edit, @fetprofile + + + @toolbar_elements << {:hicon=>'icon-pencil', :text=> I18n.t('common.edit'),:path => edit_fetprofile_path(@fetprofile) } if can? :edit, @fetprofile + @toolbar_elements << {:hicon=>'icon-minus', :text => I18n.t('common.delete'), :method=>:delete, :confirm=>"Sure"} - else - @toolbar_elements << {:text=>I18n.t('common.verwalten'),:path=>fetprofile_path(@fetprofile,{:verwalten=>true}),:icon=>:pencil} if can? :verwalten, @fetprofile - end + respond_to do |format| format.html # show.html.erb format.json { render json: @fetprofile }