From cbec643b96958d9effbf669dbbdd074329600553 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Sun, 16 Mar 2014 15:28:22 +0100 Subject: [PATCH] #114 closed --- app/controllers/themengruppen_controller.rb | 4 ++++ app/views/lecturers/_lec_lva.html.erb | 2 +- app/views/themengruppen/faqs.html.erb | 17 +++++++++++++++++ app/views/themengruppen/index.html.erb | 1 + config/routes.rb | 1 + 5 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 app/views/themengruppen/faqs.html.erb diff --git a/app/controllers/themengruppen_controller.rb b/app/controllers/themengruppen_controller.rb index 07c0a06..223881d 100644 --- a/app/controllers/themengruppen_controller.rb +++ b/app/controllers/themengruppen_controller.rb @@ -12,6 +12,10 @@ class ThemengruppenController < ApplicationController format.json { render json: @themengruppen } end end + def faqs + @themengruppen = Themengruppe.order(:priority).includes(:themen,{themen: :fragen}) + + end # GET /themengruppen/1 # GET /themengruppen/1.json diff --git a/app/views/lecturers/_lec_lva.html.erb b/app/views/lecturers/_lec_lva.html.erb index 1b498f7..283646e 100644 --- a/app/views/lecturers/_lec_lva.html.erb +++ b/app/views/lecturers/_lec_lva.html.erb @@ -3,7 +3,7 @@
-

<%= link_to lec_lva.name, lec_lva %>

+

<%= lec_lva.name %>

Email: <%= mail_to lec_lva.email %>
TISS: <%= link_to lec_lva.name, lec_lva.link, target: "_blank" %>
diff --git a/app/views/themengruppen/faqs.html.erb b/app/views/themengruppen/faqs.html.erb new file mode 100644 index 0000000..24fcb5a --- /dev/null +++ b/app/views/themengruppen/faqs.html.erb @@ -0,0 +1,17 @@ +<% @themengruppen.each do |tg| %> + +

<%= tg.title%>

+ +<% end %> diff --git a/app/views/themengruppen/index.html.erb b/app/views/themengruppen/index.html.erb index bb3f49f..95ae611 100644 --- a/app/views/themengruppen/index.html.erb +++ b/app/views/themengruppen/index.html.erb @@ -1,4 +1,5 @@
+

<%= link_to "FAQS", faqs_themengruppen_path %>