app/views/addresses/confirm_destroy.html.erb @@ -1,5 +1,5 @@ class AddressesController < ApplicationController - before_filter :current_address, :only => [:show, :edit, :update, :destroy] + before_filter :current_address, :only => [:show, :edit, :update, :destroy, :confirm_destroy] def index if params[:customer_id].blank? @addresses = current_user.user_addresses @@ -76,6 +76,9 @@ class AddressesController < ApplicationController end end + def confirm_destroy + end + private def current_address if params[:customer_id] app/controllers/addresses_controller.rb @@ -1,6 +1,6 @@ class InvoicesController < ApplicationController - before_filter :current_invoice, :only => [:show, :edit, :destroy, :confirm_destroy, :update] + before_filter :current_invoice, :only => [:show, :edit, :update, :destroy, :confirm_destroy] require 'fpdf' load 'fpdf_table.rb' app/controllers/invoices_controller.rb @@ -38,11 +38,9 @@ module ApplicationHelper number_to_currency(amount, :unit => '€ ', :separator => ',', :delimiter => '.') end - def link_to_destroy title, options={}, html_options={} - unless options.is_a?(String) - options = {:action => :delete}.update(options) - end - html_options = {:confirm => 'Are you sure?', :method => :delete}.update(html_options) - link_to title, options, html_options + def link_to_destroy title, confirm_message, url, fallback_url + url = url_for(url) unless url.is_a?(String) + fallback_url = url_for(fallback_url) unless fallback_url.is_a?(String) + link_to_function title, "confirm_destroy(this, '#{escape_javascript url}', '#{escape_javascript confirm_message}', '#{escape_javascript form_authenticity_token}')", :href => fallback_url end end app/helpers/application_helper.rb @@ -3,5 +3,7 @@ <td><%= h address.name %></td> <td><%= h address.street %> <%= h address.postcode %> <%= h address.city %> <%= h address.country %></td> <td><%= h address.tax_number %></td> - <td><%= link_to 'bearbeiten', edit_address_url(address) %></td> + <td><%= link_to 'bearbeiten', edit_address_url(address) %> + <%= link_to_destroy 'löschen', 'Wollen Sie die Adresse wirklich löschen?', address_path(address), confirm_destroy_address_path(address) %> + </td> </tr> app/views/addresses/_address.html.erb @@ -2,11 +2,11 @@ <table id="addresses"> <tr> - <th width="20%">Firmenname</th> + <th width="15%">Firmenname</th> <th width="20%">Ansprechperson</th> - <th width="40%">Adresse</th> + <th width="35%">Adresse</th> <th width="10%">Steuernummer</th> - <th width="10%">Aktionen</th> + <th width="20%">Aktionen</th> </tr> <%= render :partial => 'address', :collection => @addresses %> </table> \ No newline at end of file app/views/addresses/index.html.erb @@ -5,5 +5,5 @@ <td><%= h address.tax_number %></td> <td><%= link_to 'zeigen', customer_address_path(@customer, address) %> <%= link_to 'bearbeiten', edit_customer_address_path(@customer, address) %> - <%= link_to_destroy 'löschen', {:id => address.id}, {:href => confirm_destroy_customer_address_path(@customer, address)} %></td> + <%= link_to_destroy 'löschen', 'Wollen Sie die Adresse wirklich löschen?', customer_address_path(@customer, address), confirm_destroy_customer_address_path(@customer, address)} %></td> </tr> app/views/customers/_address.html.erb @@ -3,5 +3,5 @@ <td><%= link_to customer.name, customer_url(customer) %></td> <td><%= customer.invoices.count %></td> <td><%= customer.open_invoices.count %></td> - <td><%= link_to 'ändern', edit_customer_path(customer) %> <%= link_to 'zeigen', customer_path(customer) %> <%= link_to_destroy 'löschen', customer_path(customer), {:href => confirm_destroy_customer_path(customer)} %></td> + <td><%= link_to 'ändern', edit_customer_path(customer) %> <%= link_to 'zeigen', customer_path(customer) %> <%= link_to_destroy 'löschen', 'Wollen Sie den Kunden wirklich löschen?', customer_path(customer), confirm_destroy_customer_path(customer) %></td> </tr> app/views/customers/_customer.html.erb @@ -7,6 +7,6 @@ <td><%= number_to_euro(invoice.tax_amount) %></td> <td><%= link_to "ändern", edit_invoice_path(invoice) %> <%= link_to "zeigen", customer_invoice_path(@customer, invoice) %> <%= link_to "PDF", formatted_customer_invoice_path(@customer, invoice, :pdf) %> - <%= link_to_destroy "löschen", {:id => invoice.id}, {:href => confirm_destroy_customer_invoice_path(@customer, invoice)} %> </td> + <%= link_to_destroy "löschen", "Wollen Sie diese Rechnung wirklich löschen?", customer_invoice_path(@customer, invoice), confirm_destroy_customer_invoice_path(@customer, invoice) %> </td> </tr> \ No newline at end of file app/views/customers/_invoice.html.erb @@ -8,6 +8,6 @@ <td><%= number_to_euro(invoice.tax_amount) %></td> <td><%= link_to "ändern", edit_invoice_path(invoice) %> <%= link_to "zeigen", invoice_path(invoice) %> <%= link_to "PDF", formatted_invoice_path(invoice, :pdf) %> - <%= link_to_destroy "löschen", {:id => invoice.id}, {:href => confirm_destroy_invoice_path(invoice)} %> </td> + <%= link_to_destroy "löschen", 'Wollen Sie die Rechnung wirklich löschen?', invoice_path(invoice), confirm_destroy_invoice_path(invoice) %> </td> </tr> \ No newline at end of file app/views/invoices/_invoice.html.erb @@ -1,5 +1,5 @@ <li><%= link_to_unless_current 'neue Rechnung', new_invoice_path %></li> <% unless @invoice.nil? or @invoice.new_record? %> <li><%= link_to_unless_current 'PDF', formatted_invoice_path(@invoice, :pdf) %></li> -<li><%= link_to_destroy "löschen", {:id => @invoice.id}, {:href => confirm_destroy_invoice_path(@invoice)} %></li> +<li><%= link_to_destroy "löschen", 'Wollen Sie die Rechnung wirklich löschen?', invoice_path(@invoice), confirm_destroy_invoice_path(@invoice) %></li> <% end %> app/views/invoices/_navigation.html.erb @@ -4,5 +4,5 @@ <p> Wollen Sie die Rechnung wirklich löschen? </p> - <%= submit_tag 'Löschen' %> <%= link_to 'zurück zur Rechnung', :back %> + <%= submit_tag 'Löschen' %> </form> app/views/invoices/confirm_destroy.html.erb @@ -1,2 +1,25 @@ // Place your application-specific JavaScript functions and classes here // This file is automatically included by javascript_include_tag :defaults +/* http://railscasts.com/episodes/77 */ +function confirm_destroy(element, action, confirm_message, auth_token) { + if (confirm(confirm_message)) { + var f = document.createElement('form'); + f.style.display = 'none'; + element.parentNode.appendChild(f); + f.method = 'POST'; + f.action = action; + var m = document.createElement('input'); + m.setAttribute('type', 'hidden'); + m.setAttribute('name', '_method'); + m.setAttribute('value', 'delete'); + f.appendChild(m); + var t = document.createElement('input'); + t.setAttribute('type', 'hidden'); + t.setAttribute('name', 'authenticity_token'); + t.setAttribute('value', auth_token); + f.appendChild(t); + console.log(f); + f.submit(); + } + return false; +} \ No newline at end of file public/javascripts/application.js 12afb5355c1b015c5c44137388ffae623a3f55a8 TomK32 tomk32@tomk32.de http://github.com/TomK32/exabuch/commit/a23ac106e19d56f8216c1fd0e08059ef9eff023d a23ac106e19d56f8216c1fd0e08059ef9eff023d 2008-05-14T10:37:58-07:00 2008-05-14T10:37:58-07:00 deleting objects now with js-fallback, sadly there's a bug in rails (http://dev.rubyonrails.org/ticket/11097) but with a custom js-method is more elegant anyways 60282d3e697827d764699d3aea722bbf5f477209 TomK32 tomk32@tomk32.de