diff --git a/app/controllers/neuigkeiten_controller.rb b/app/controllers/neuigkeiten_controller.rb index 52701ff..60e5ce3 100755 --- a/app/controllers/neuigkeiten_controller.rb +++ b/app/controllers/neuigkeiten_controller.rb @@ -131,7 +131,15 @@ class NeuigkeitenController < ApplicationController format.js end end - + def delete_link + @neuigkeit = Neuigkeit.find(params[:id]) + @nlink = @neuigkeit.nlinks.find(params[:nlink_id]) + @nlink.destroy + respond_to do |format| + format.html { redirect_to @neuigkeit } + format.js + end + end def create @neuigkeit = Neuigkeit.new(params[:neuigkeit]) @neuigkeit.author=current_user @@ -167,7 +175,7 @@ class NeuigkeitenController < ApplicationController format.html { redirect_to rubrik } end - end + end private def load_toolbar_elements diff --git a/app/views/lvas/show.html.erb b/app/views/lvas/show.html.erb index 60c311e..9fe7bb7 100755 --- a/app/views/lvas/show.html.erb +++ b/app/views/lvas/show.html.erb @@ -1,11 +1,20 @@
<%= render 'studien/tabs'%>

<%= notice %>

+ +
+
+ <%= render 'layouts/pretty_toolbar' %> +
+
+

<%= @lva.full_name %>

Prüfungsinformation

@@ -17,13 +26,12 @@
<%= @lva.lernaufwand %>
+

Beschreibung

<%= @lva.desc.to_s.html_safe %>
- -
@@ -79,11 +87,6 @@
-
-
- <%= render 'layouts/pretty_toolbar' %> -
-
<%= render 'beispiele/form_bulk' %> diff --git a/app/views/neuigkeiten/_nlink_list.html.erb b/app/views/neuigkeiten/_nlink_list.html.erb index f6d9eb5..f011fba 100644 --- a/app/views/neuigkeiten/_nlink_list.html.erb +++ b/app/views/neuigkeiten/_nlink_list.html.erb @@ -1,9 +1,13 @@ - <%= link_to nlink_list.link do %> -
+<%= link_to nlink_list.link do %> +
+
<% p = nlink_list.link_type.downcase.pluralize+"/nlink" %> <%= raw(strip_links(render :partial=>p, :object=>nlink_list.link )) %> +
+<%= link_to "DELETE", delete_link_rubrik_neuigkeit_path(nlink_list.neuigkeit.rubrik,nlink_list.neuigkeit.id, :nlink_id=>nlink_list.id) %>
+ <% end %> diff --git a/app/views/neuigkeiten/show.html.erb b/app/views/neuigkeiten/show.html.erb index 53f946f..66b2e13 100755 --- a/app/views/neuigkeiten/show.html.erb +++ b/app/views/neuigkeiten/show.html.erb @@ -28,10 +28,32 @@ <%= render 'layouts/pretty_toolbar', :object=> @toolbar_elements %>
<%= render partial: 'nlink_list_whole', :object=>@neuigkeit.nlinks %> -<%= render partial: 'nlink_list_search_whole', object: @nlink_search %> + + Neue Verknüpfungen + + + +
diff --git a/app/views/studien/_tabs.html.erb b/app/views/studien/_tabs.html.erb index b35a622..788997d 100644 --- a/app/views/studien/_tabs.html.erb +++ b/app/views/studien/_tabs.html.erb @@ -20,6 +20,6 @@ <% else %>
  • <% end %> -<%= link_to I18n.t("studien.verwaltung.title"), studien_verwalten_path if can? :verwalten, Studium %> +<%= link_to I18n.t("studien.verwaltung.title"), studien_verwalten_path if can? :verwalten, Studium %>
  • diff --git a/config/routes.rb b/config/routes.rb index 2c76fb0..54ea679 100755 --- a/config/routes.rb +++ b/config/routes.rb @@ -124,6 +124,7 @@ Fetsite::Application.routes.draw do get 'add_calentry' get 'rm_calentry' get 'create_link' + get 'delete_link' get 'find_link' get 'publish_to_facebook' get 'mail_to_fet'