Improve (AJAX) deletion of StockArticles

app/controllers/stockit_controller.rb

@@ -32,9 +32,9 @@ class StockitController < ApplicationController
   end
 
   def destroy
-    StockArticle.find(params[:id]).destroy
+    @article = StockArticle.find(params[:id])
-    render :layout => false,
+    @article.destroy
-      :locals => { :destroyed_article_id => params[:id] }
+    render :layout => false
   rescue => error
     render :partial => "destroy_fail", :layout => false,
       :locals => { :fail_msg => "Ein Fehler ist aufgetreten: " + error.message }

app/views/stockit/_destroy_fail.js.haml

@@ -1,7 +1,5 @@
--# please polish the following line if you know how
+-# please polish the following line if you know how, same in view destroy
-var errorDiv = $('<div class="alert fade in alert-error"><a class="close" data-dismiss="alert" href="#">×</a></div>');
+var errorDiv = $('<div class="alert fade in alert-error"><a class="close" data-dismiss="alert" href="#">x</a></div>');
-
--# next line, createTextNode called by .text(textString) helps escaping for html, but what about ' signs?
-errorDiv.text('#{fail_msg}');
 
+errorDiv.append(document.createTextNode('#{j(fail_msg)}'));
 $('div.container-fluid').prepend(errorDiv);

app/views/stockit/destroy.js.haml

@@ -1 +1,14 @@
-console.log('#{destroyed_article_id}');
+-# please polish the following line if you know how, same in partial _destroy_fail
+var successDiv = $('<div class="alert fade in alert-success"><a class="close" data-dismiss="alert" href="#">x</a></div>');
+
+successDiv.append(document.createTextNode('Artikel #{j(@article.name)} gelöscht.'));
+$('div.container-fluid').prepend(successDiv);
+
+-# WARNING: If you try to use the escape j(...) here, an error occurs:
+-# Ein Fehler ist aufgetreten: undefined method `gsub' for 50:Fixnum
+-# However, it should work without without escaping.
+-# Note that article names which are purely numeric, e.g. 12345, are escaped correctly (see above).
+
+$('#stockArticle-#{@article.id}').remove();
+
+-# WARNING: Do not use a simple .fadeOut() above, because it conflicts with the show/hide function of unavailable articles.

app/views/stockit/index.html.haml

@@ -44,7 +44,7 @@
       %th
   %tbody
     - for article in @stock_articles
-      %tr{:class => stock_article_classes(article)}
+      %tr{:class => stock_article_classes(article), :id => "stockArticle-#{article.id}"}
         %td=h article.name
         %td= article.quantity
         %td= article.quantity - article.quantity_available