andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Bugfix in studien/verwalten

Browse Source
This commit is contained in:
Thomas Blazek
2013-08-21 12:12:34 +02:00
parent faf977e651
commit 162781ac04
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/studien_controller.rb
View File

@@ -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

4
app/views/studien/verwalten.html.erb
View File

@@ -8,7 +8,7 @@
<h2>Studien </h2>
<div class="verwalten-block">
<div class="row-fluid">
<% @studien.each_slice((Studium.count/2.0).ceil) do |col| %>
<% @studien.each_slice([(Studium.count/2.0).ceil, 1].max) do |col| %>
<div class="span6">
<% col.each do |s| %>
@@ -38,7 +38,7 @@
<h2>Vortragende </h2>
<div class="verwalten-block">
<div class="row-fluid">
<% @lecturers.each_slice((Lecturer.count/3.0).ceil) do |col| %>
<% @lecturers.each_slice([(Lecturer.count/3.0).ceil, 1].max) do |col| %>
<div class="span4">
<% col.each do |lec| %>
<%= (lec.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe %> <%= link_to lec.name, lec %> | <%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_lecturer_path(lec)%> <br>