From 4c479195436c6982a107378314215b766cc77d37 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Sat, 15 Nov 2014 12:53:58 +0100
Subject: [PATCH] nlink-modul

---
 app/controllers/moduls_controller.rb | 7 ++++---
 app/views/lvas/_nlink.html.erb       | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/controllers/moduls_controller.rb b/app/controllers/moduls_controller.rb
index d53aed8..c0ba0c8 100755
--- a/app/controllers/moduls_controller.rb
+++ b/app/controllers/moduls_controller.rb
@@ -176,7 +176,7 @@ end
 
   def load_toolbar_show
     @toolbar_elements=[]
-    @toolbar_elements = {:hicon=>'icon-plus-sign', :text=>I18n.t("lva.add"), :path=>new_lva_path(:modul_id =>@modul.id)} if can? :new, Lva
+    @toolbar_elements << {:hicon=>'icon-plus-sign', :text=>I18n.t("lva.add"), :path=>new_lva_path(:modul_id =>@modul.id)} if can? :new, Lva
     @toolbar_elements << {:hicon=>'icon-pencil', :text=>"Lvas bearbeiten", :path=>edit_lvas_modul_path(@modul)} if can? :edit, Lva
     @toolbar_elements << {:hicon=>'icon-plus-sign', :text=>"ADD FROM TISS", :path=>load_tiss_modul_path(:modul_id =>@modul.id)} if can? :load_tiss, Modul
     @toolbar_elements << {:hicon=>'icon-pencil', :text=>I18n.t("modul.edit"), :path=>edit_modul_path(@modul)} if can? :edit, @modul
@@ -189,8 +189,9 @@ end
   
   def load_toolbar_index 
 
-      @toolbar_elements = [{:hicon=>'icon-plus-sign', :text=>I18n.t("modul.add"), :path=>new_modul_path}] if can? :new , Modul
-      @topbar_elements =[{:hicon=>'icon-list', :text=>I18n.t("studien.allestudien"),:path=>studien_path}]
+      @toolbar_elements = []
+    @topbar_elements<<{:hicon=>'icon-plus-sign', :text=>I18n.t("modul.add"), :path=>new_modul_path} if can? :new , Modul
+      @topbar_elements<< {:hicon=>'icon-list', :text=>I18n.t("studien.allestudien"),:path=>studien_path}
       @topbar_elements<<{:hicon=>'icon-list', :text=>I18n.t("modul.list"),:path=>moduls_path}
       @topbar_elements<<{:hicon=>'icon-list', :text=>I18n.t("lva.list"),:path=>lvas_path}
 
diff --git a/app/views/lvas/_nlink.html.erb b/app/views/lvas/_nlink.html.erb
index 029de7f..e9c4548 100644
--- a/app/views/lvas/_nlink.html.erb
+++ b/app/views/lvas/_nlink.html.erb
@@ -1,2 +1,2 @@
-<h2><%= nlink.title %></h2>
-<% render :partial=>  "lvas/lva", :object=>nlink %>
+<h2><%= nlink.title unless nlink.nil? %></h2>
+<%= render :partial=>  "lvas/lva", :object=>nlink unless nlink.nil? %>