From 853bc1e5da21d900bc1d3008f6b387091747cc06 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Sun, 14 Sep 2014 02:00:21 +0200 Subject: [PATCH] themengruppe verwalten fix link --- app/controllers/themengruppen_controller.rb | 11 +++++------ app/views/themengruppen/verwalten.html.erb | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/controllers/themengruppen_controller.rb b/app/controllers/themengruppen_controller.rb index c2d310e..b43a1c1 100644 --- a/app/controllers/themengruppen_controller.rb +++ b/app/controllers/themengruppen_controller.rb @@ -56,16 +56,15 @@ class ThemengruppenController < ApplicationController @themengruppen_intern =Themengruppe.intern.order(:priority).reverse @toolbar_elements = [{:icon=>:plus, :hicon=>'icon-plus-sign', :text=>I18n.t('themengruppe.new'), :path=>new_themengruppe_path()}] - end + end def verwalten - @themengruppe = Themengruppe.find(params[:themengruppe_id]) - @themen = @themengruppe.themen.order(:priority).reverse - + @themengruppe = Themengruppe.find(params[:themengruppe_id]) + @themen = @themengruppe.themen.order(:priority).reverse + @toolbar_elements =[] @toolbar_elements << {:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t('themengruppe.edit'), :path=>edit_themengruppe_path(@themengruppe)} if can? :edit, @themengruppe - @toolbar_elements << {:icon=>:plus, :hicon=>'icon-plus-sign', :text=>I18n.t('thema.add'), :path=>new_themengruppe_thema_path(@themengruppe)} if can? :new, Themengruppe + @toolbar_elements << {:icon=>:plus, :hicon=>'icon-plus-sign', :text=>I18n.t('thema.add'), :path=>new_themengruppe_thema_path(@themengruppe), :remote=>true} if can? :new, Thema @toolbar_elements << {:hicon=>'icon-remove-circle',:text=>I18n.t('themengruppe.remove'), :path=>themengruppe_path(@themengruppe), :method=>:delete,:confirm=>I18n.t('themengruppe.sure')} if can? :delete, @themengruppe - end def sort_themengruppen diff --git a/app/views/themengruppen/verwalten.html.erb b/app/views/themengruppen/verwalten.html.erb index ce0b343..3fe20db 100644 --- a/app/views/themengruppen/verwalten.html.erb +++ b/app/views/themengruppen/verwalten.html.erb @@ -11,7 +11,7 @@ -<%= link_to new_themengruppe_thema_path(@themengruppe),:remote=>true do %> New Thema <% end %> +