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

Bugfixes

Browse Source
This commit is contained in:
Thomas Blazek
2013-08-02 19:08:35 +02:00
parent 3114d9fa52
commit 2b5a6edb3b
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/controllers/modulgruppen_controller.rb
View File

@@ -56,7 +56,6 @@ class ModulgruppenController < ApplicationController
else else
@studium=Studium.find_by_id(params[:modulgruppe][:studium_id]) @studium=Studium.find_by_id(params[:modulgruppe][:studium_id])
end end
@modulgruppe.studium_id = params[:studium_id]
respond_to do |format| respond_to do |format|
if @modulgruppe.save if @modulgruppe.save

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

@@ -1,7 +1,7 @@
<% @lva.modul.each do |modul| %> <% @lva.modul.each do |modul| %>
<% modul.modulgruppen.each do |g| %> <% modul.modulgruppen.each do |g| %>
<ul class="breadcrumb"> <ul class="breadcrumb">
<li><%= link_to g.studium.name , studium_path(g.studium)%> <li><%= link_to g.studium.name , studium_semesteransicht_path(g.studium)%>
<span class="divider">/</span></li> <span class="divider">/</span></li>
<li><%= link_to g.name , modulgruppe_path(g)%><span class="divider">/</span></li> <li><%= link_to g.name , modulgruppe_path(g)%><span class="divider">/</span></li>
<li><%= link_to modul.name , modul_path(modul)%></li> <li><%= link_to modul.name , modul_path(modul)%></li>

6
app/views/studien/_navigation.html.erb
View File

@@ -2,15 +2,15 @@
<ul class="breadcrumb"> <ul class="breadcrumb">
<li> <%= link_to '<i class="icon-list"></i>'.html_safe+ I18n.t("studien.allestudien"), studien_path,:raw=>true %> <li> <%= link_to '<i class="icon-list"></i>'.html_safe+ I18n.t("studien.allestudien"), studien_path,:raw=>true %>
<span class="divider">/</span></li> <span class="divider">/</span></li>
<li> <%= link_to @text, @path%> <li> <%= link_to @text, @path%>
<span class="divider">/</span></li> <span class="divider">/</span></li>
<br> <br>
<% Studium.all.each do |s| %> <% Studium.all.each do |s| %>
<li> <li>
<% if @sem=='true' %> <% if @sem=='true' %>
<%= link_to s.name, studium_semesteransicht_path(s) %> <%= link_to_unless_current s.name, studium_semesteransicht_path(s) %>
<% else %> <% else %>
<%= link_to s.name, studium_path(s) %> <%= link_to_unless_current s.name, studium_path(s) %>
<% end %> <% end %>
<span class="divider">/</span></li> <span class="divider">/</span></li>
</li> </li>

6
app/views/studien/show.html.erb
View File

@@ -4,6 +4,7 @@
<p id="notice"><%= notice %></p> <p id="notice"><%= notice %></p>
<h1><%= @studium.typ %> <%= @studium.name %> (<%= @studium.zahl %>)</h1> <h1><%= @studium.typ %> <%= @studium.name %> (<%= @studium.zahl %>)</h1>
</div> </div>
<div>
<%= raw(@studium.desc) %> <%= raw(@studium.desc) %>
<% @studienphasen.each do |sp| %> <% @studienphasen.each do |sp| %>
<% sp[:modulgruppen].each do |row| %> <% sp[:modulgruppen].each do |row| %>
@@ -16,6 +17,7 @@
</div> </div>
<% end %> <% end %>
<% end %> <% end %>
<%= render 'layouts/pretty_toolbar' %><br> <%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %>
<%= render :partial=>'layouts/pretty_toolbar', :object=>@toolbar_modulgruppen %> </div>
<%= render 'layouts/pretty_toolbar' %>
</div> </div>