Merge branch 'master' of https://github.com/andreassteph/fetsite
This commit is contained in:
@@ -3,7 +3,7 @@ class ThemengruppenController < ApplicationController
|
|||||||
# GET /themengruppen.json
|
# GET /themengruppen.json
|
||||||
load_and_authorize_resource
|
load_and_authorize_resource
|
||||||
def index
|
def index
|
||||||
@themengruppen = Themengruppe.all
|
@themengruppen = Themengruppe.order(:title)
|
||||||
@toolbar_elements = [{:icon=>:plus, :hicon=>'icon-plus-sign', :text=>I18n.t('themengruppe.new'), :path=>new_themengruppe_path()}]
|
@toolbar_elements = [{:icon=>:plus, :hicon=>'icon-plus-sign', :text=>I18n.t('themengruppe.new'), :path=>new_themengruppe_path()}]
|
||||||
|
|
||||||
respond_to do |format|
|
respond_to do |format|
|
||||||
|
|||||||
@@ -26,7 +26,7 @@
|
|||||||
<div class="span6">
|
<div class="span6">
|
||||||
<!--<b><%= I18n.t("themengruppe.themen") %></b>
|
<!--<b><%= I18n.t("themengruppe.themen") %></b>
|
||||||
--><ul>
|
--><ul>
|
||||||
<% themengruppe.themen.each do |t| %>
|
<% themengruppe.themen.order(:title).each do |t| %>
|
||||||
<li>
|
<li>
|
||||||
<%= render t %>
|
<%= render t %>
|
||||||
</li>
|
</li>
|
||||||
|
|||||||
Reference in New Issue
Block a user