From 162781ac0496c0167996f43d93bbf1c1cc77ef20 Mon Sep 17 00:00:00 2001 From: Thomas Blazek Date: Wed, 21 Aug 2013 12:12:34 +0200 Subject: [PATCH] Bugfix in studien/verwalten --- app/controllers/studien_controller.rb | 8 +++++--- app/views/studien/verwalten.html.erb | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/controllers/studien_controller.rb b/app/controllers/studien_controller.rb index 22fae68..f94a440 100755 --- a/app/controllers/studien_controller.rb +++ b/app/controllers/studien_controller.rb @@ -161,9 +161,9 @@ class StudienController < ApplicationController end if !@new_params[:lec_verw].nil? @lecturers=[Lecturer.find(@new_params[:lec_verw])] - temp = @lecturers.map{|x| x.lva}.flatten.uniq #Force Force Lvas + temp = @lecturers.map{|x| x.lvas}.flatten.uniq #Force Force Lvas @lvas=@lvas.select{|k| temp.include?(k)} - temp = @lva.map{|x| x.moduls}.flatten.uniq #Force Force Lvas + temp = @lvas.map{|x| x.modul}.flatten.uniq #Force Force Lvas @module=@module.select{|k| temp.include?(k)} temp = @module.map{|x| x.modulgruppen}.flatten.uniq # Force Modulgruppen @modulgruppen = @modulgruppen.select{|k| temp.include?(k)} @@ -247,7 +247,9 @@ class StudienController < ApplicationController :mg_verw=> params[:mg_verw], :m_verw=>params[:m_verw], :lva_verw=>params[:lva_verw], - :b_verw=>params[:b_verw]}.merge(super) + :b_verw=>params[:b_verw], + :lec_verw=>params[:lec_verw]}.merge(super) + end end diff --git a/app/views/studien/verwalten.html.erb b/app/views/studien/verwalten.html.erb index af2b07e..4a22854 100644 --- a/app/views/studien/verwalten.html.erb +++ b/app/views/studien/verwalten.html.erb @@ -8,7 +8,7 @@

Studien

- <% @studien.each_slice((Studium.count/2.0).ceil) do |col| %> + <% @studien.each_slice([(Studium.count/2.0).ceil, 1].max) do |col| %>
<% col.each do |s| %> @@ -38,7 +38,7 @@

Vortragende

- <% @lecturers.each_slice((Lecturer.count/3.0).ceil) do |col| %> + <% @lecturers.each_slice([(Lecturer.count/3.0).ceil, 1].max) do |col| %>
<% col.each do |lec| %> <%= (lec.valid?) ? ' '.html_safe : ''.html_safe %> <%= link_to lec.name, lec %> | <%=link_to ''.html_safe+ 'edit', edit_lecturer_path(lec)%>