introduced lva.full_name and rewrote displays
This commit is contained in:
@@ -52,7 +52,7 @@ class Lva < ActiveRecord::Base
|
||||
validates_presence_of :stunden # Stunden Eingetragen?
|
||||
validates_presence_of :modul # Zugehöriges Modul eingetragen?
|
||||
# (zumindest eines)
|
||||
def typ_name
|
||||
def full_name
|
||||
return self.typ + ' ' + self.name
|
||||
end
|
||||
def add_semesters
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
<%= link_to b, {:class=> :linkbox} do %>
|
||||
<div class="row-fluid">
|
||||
<div class="span8">
|
||||
<b><%=b.name%></b> (<%=b.lva.name%>)
|
||||
<b><%=b.name%></b> (<%=b.lva.full_name%>)
|
||||
</div>
|
||||
<div class="span4">
|
||||
<%=b.updated_at.to_s%>
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
|
||||
<div class="lva-semester">
|
||||
<%=lva.lvanr.to_s %> <b><%= link_to lva.name, lva_path(lva)%></b> <%= lva.ects %> ECTS / <%= lva.stunden %> Std<br>
|
||||
<%=lva.lvanr.to_s %> <b><%= link_to lva.full_name, lva_path(lva)%></b> <%= lva.ects %> ECTS / <%= lva.stunden %> Std<br>
|
||||
<!-- <div class="hidden-phone">
|
||||
Module: /<% lva.modul.each do |m| %> <%= link_to m.name + ' / ', modul_path(m) unless m.modulgruppen.map{|x| x.studium}.index(@studium).nil? && !@studium.nil? %><% end %>
|
||||
<br>
|
||||
|
||||
@@ -127,7 +127,7 @@
|
||||
|
||||
|
||||
<% @lvas.each do |lva| %>
|
||||
<%= (lva.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe %><%= link_to lva.name, lva %> |
|
||||
<%= (lva.valid?) ? '<i class="icon-ok"> </i>'.html_safe : '<i class="icon-remove"></i>'.html_safe %><%= link_to lva.full_name, lva %> |
|
||||
<%=link_to '<i class="icon-pencil"></i>'.html_safe+ 'edit', edit_lva_path(lva)%><br>
|
||||
|
||||
<% end %>
|
||||
|
||||
Reference in New Issue
Block a user