Merge branch 'master' of github.com:fetsite/fetsite

This commit is contained in:
Andreas Stephanides
2014-12-05 14:50:04 +01:00
2 changed files with 11 additions and 5 deletions

View File

@@ -59,7 +59,7 @@ class ThemengruppenController < ApplicationController
end
def verwalten
@themengruppe = Themengruppe.find(params[:themengruppe_id])
@themen = @themengruppe.themen.order(:priority).reverse
@themen = @themengruppe.themen.order(:priority)
@toolbar_elements =[]
@toolbar_elements << {:icon=>:pencil, :hicon=>'icon-pencil', :text=>I18n.t('themengruppe.edit'), :path=>edit_themengruppe_path(@themengruppe)} if can? :edit, @themengruppe