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

2014-06-24 16:31:08 +05:30
parent 3a8ccdd205 87bc66f7df
commit a86d7482f1
2 changed files with 2 additions and 2 deletions
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -12,7 +12,7 @@ class HomeController < ApplicationController
  def intern
    authorize! :seeintern, User
    @neuigkeiten = Neuigkeit.intern.recent
-    @themengruppen=Themengruppe.intern
+    @themengruppen=Themengruppe.intern.order(:priority).reverse
  end
  def admin
    authorize! :doadmin, User
--- a/app/views/themengruppen/show.html.erb
+++ b/app/views/themengruppen/show.html.erb
@@ -9,7 +9,7 @@
    <%= @themengruppe.text %>
  </p>
  <ul class="unstyled linkbox-list" >
-    <% @themengruppe.themen.each do |thema| %>
+    <% @themen.each do |thema| %>
    <li>
      <div class="contentbox">	
 	<%= render :partial => 'themen/small', :object => thema %>