Merge remote-tracking branch 'github/master'

Conflicts: app/models/ability.rb
2013-03-02 20:31:22 +01:00
parent cdf7acd426 0de57e08a9
commit f8ad8f4527
4 changed files with 16 additions and 8 deletions
--- a/app/views/moduls/_kurz.html.erb
+++ b/app/views/moduls/_kurz.html.erb
@@ -1,5 +1,5 @@
 <div style="border: solid 1px; padding:2px;margin-top:5px;"><p>
-  <b><%= link_to "Modul "+ modul.name , modul_path(modul) %> </b>
+  <b><% if !modul.name.nil? %><%= link_to "Modul "+ modul.name , modul_path(modul) %> <%end%></b>
 </p>
 <p >
  <%= raw(modul.desc) %>