bofh/fetsite
9
0
Fork 1
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andreas Stephanides
2014-06-24 16:31:08 +05:30
parent 3a8ccdd205 87bc66f7df
commit a86d7482f1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/home_controller.rb
View File

@@ -12,7 +12,7 @@ class HomeController < ApplicationController
def intern def intern
authorize! :seeintern, User authorize! :seeintern, User
@neuigkeiten = Neuigkeit.intern.recent @neuigkeiten = Neuigkeit.intern.recent
@themengruppen=Themengruppe.intern @themengruppen=Themengruppe.intern.order(:priority).reverse
end end
def admin def admin
authorize! :doadmin, User authorize! :doadmin, User

2
app/views/themengruppen/show.html.erb
View File

@@ -9,7 +9,7 @@
<%= @themengruppe.text %> <%= @themengruppe.text %>
</p> </p>
<ul class="unstyled linkbox-list" > <ul class="unstyled linkbox-list" >
<% @themengruppe.themen.each do |thema| %> <% @themen.each do |thema| %>
<li> <li>
<div class="contentbox"> <div class="contentbox">
<%= render :partial => 'themen/small', :object => thema %> <%= render :partial => 'themen/small', :object => thema %>