diff options
| -rw-r--r-- | app/views/companies/_company.erb | 2 | ||||
| -rw-r--r-- | app/views/companies/show.html.erb | 2 | ||||
| -rw-r--r-- | app/views/connection_links/_connection_link.erb | 2 | ||||
| -rw-r--r-- | app/views/connection_links/show.html.erb | 2 | ||||
| -rw-r--r-- | app/views/exports/_export.erb | 2 | ||||
| -rw-r--r-- | app/views/exports/show.html.erb | 2 | ||||
| -rw-r--r-- | app/views/file_validations/_file_validation.erb | 2 | ||||
| -rw-r--r-- | app/views/file_validations/show.html.erb | 2 | ||||
| -rw-r--r-- | app/views/imports/_import.erb | 2 | ||||
| -rw-r--r-- | app/views/imports/show.html.erb | 2 | ||||
| -rw-r--r-- | spec/spec_helper.rb | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/app/views/companies/_company.erb b/app/views/companies/_company.erb index 34c65b798..4955dec8b 100644 --- a/app/views/companies/_company.erb +++ b/app/views/companies/_company.erb @@ -4,7 +4,7 @@ <%= company.human_attribute_name('code') %> <%= company.code %> <div class="actions"> <%= link_to t("actions.edit"), edit_referential_company_path(@referential, company), :class => "edit" %> | - <%= link_to t("actions.destroy"), referential_company_path(@referential, company), :method => :delete, :confirm => t('companies.actions.destroy_confirm'), :class => "remove" %> + <%= link_to t("actions.destroy"), referential_company_path(@referential, company), :method => :delete, :data => {:confirm => t('companies.actions.destroy_confirm')}, :class => "remove" %> </div> </div> diff --git a/app/views/companies/show.html.erb b/app/views/companies/show.html.erb index bf4a0bdc3..fe819d360 100644 --- a/app/views/companies/show.html.erb +++ b/app/views/companies/show.html.erb @@ -57,7 +57,7 @@ <% content_for :sidebar do %> <ul class="actions"> <li><%= link_to t('companies.actions.edit'), edit_referential_company_path(@referential, @company), :class => "edit" %></li> - <li><%= link_to t('companies.actions.destroy'), referential_company_path(@referential, @company), :method => :delete, :confirm => t('companies.actions.destroy_confirm'), :class => "remove" %></li> + <li><%= link_to t('companies.actions.destroy'), referential_company_path(@referential, @company), :method => :delete, :data => {:confirm => t('companies.actions.destroy_confirm')}, :class => "remove" %></li> <br> </ul> <% end %> diff --git a/app/views/connection_links/_connection_link.erb b/app/views/connection_links/_connection_link.erb index b3b44aed5..01128051a 100644 --- a/app/views/connection_links/_connection_link.erb +++ b/app/views/connection_links/_connection_link.erb @@ -17,7 +17,7 @@ <div class="actions"> <%= link_to t("actions.edit"), edit_referential_connection_link_path(@referential, connection_link), :class => "edit" %> | - <%= link_to t("actions.destroy"), referential_connection_link_path(@referential, connection_link), :method => :delete, :confirm => t('connection_links.actions.destroy_confirm'), :class => "remove" %> + <%= link_to t("actions.destroy"), referential_connection_link_path(@referential, connection_link), :method => :delete, :data => {:confirm => t('connection_links.actions.destroy_confirm')}, :class => "remove" %> </div> </div> <% end %> diff --git a/app/views/connection_links/show.html.erb b/app/views/connection_links/show.html.erb index 1ae049d99..58c90cc41 100644 --- a/app/views/connection_links/show.html.erb +++ b/app/views/connection_links/show.html.erb @@ -93,7 +93,7 @@ <% content_for :sidebar do %> <ul class="actions"> <li><%= link_to t('connection_links.actions.edit'), edit_referential_connection_link_path(@referential, @connection_link), :class => "edit" %></li> - <li><%= link_to t('connection_links.actions.destroy'), referential_connection_link_path(@referential, @connection_link), :method => :delete, :confirm => t('connection_links.actions.destroy_confirm'), :class => "remove" %></li> + <li><%= link_to t('connection_links.actions.destroy'), referential_connection_link_path(@referential, @connection_link), :method => :delete, :data => {:confirm => t('connection_links.actions.destroy_confirm')}, :class => "remove" %></li> <li><%= link_to t('connection_links.actions.select_areas'), select_areas_referential_connection_link_path(@referential, @connection_link), :class => "select_areas" %></li> <br> </ul> diff --git a/app/views/exports/_export.erb b/app/views/exports/_export.erb index 5b1bd0fcc..e8e5d4656 100644 --- a/app/views/exports/_export.erb +++ b/app/views/exports/_export.erb @@ -10,7 +10,7 @@ <% if export.status == 'completed' %> <%= link_to t("exports.actions.download"), referential_export_path(@referential, export, :format => :zip), :class => "download" %> <% end %> - <%= link_to t("actions.destroy"), referential_export_path(@referential, export), :method => :delete, :confirm => t('exports.actions.destroy_confirm'), :class => "remove" %> + <%= link_to t("actions.destroy"), referential_export_path(@referential, export), :method => :delete, :data => {:confirm => t('exports.actions.destroy_confirm')}, :class => "remove" %> </div> </div> <% end %> diff --git a/app/views/exports/show.html.erb b/app/views/exports/show.html.erb index 5439a64e8..a4695b75b 100644 --- a/app/views/exports/show.html.erb +++ b/app/views/exports/show.html.erb @@ -47,6 +47,6 @@ <% if @export.status == 'completed' %> <li><%= link_to t('exports.actions.download'), referential_export_path(@referential, @export, :format => :zip), :class => "download" %></li> <% end %> - <li><%= link_to t('exports.actions.destroy'), referential_export_path(@referential, @export), :method => :delete, :confirm => t('exports.actions.destroy_confirm'), :class => "remove" %></li> + <li><%= link_to t('exports.actions.destroy'), referential_export_path(@referential, @export), :method => :delete, :data => {:confirm => t('exports.actions.destroy_confirm')}, :class => "remove" %></li> </ul> <% end %> diff --git a/app/views/file_validations/_file_validation.erb b/app/views/file_validations/_file_validation.erb index 3e895f445..7ffed1417 100644 --- a/app/views/file_validations/_file_validation.erb +++ b/app/views/file_validations/_file_validation.erb @@ -7,7 +7,7 @@ <%= l file_validation.created_at %><br/> <%= file_validation.file_name %> <div class="actions"> - <%= link_to t("actions.destroy"), file_validation_path(file_validation), :method => :delete, :confirm => t('file_validations.actions.destroy_confirm'), :class => "remove" %> + <%= link_to t("actions.destroy"), file_validation_path(file_validation), :method => :delete, :data => {:confirm => t('file_validations.actions.destroy_confirm')}, :class => "remove" %> </div> </div> <% end %> diff --git a/app/views/file_validations/show.html.erb b/app/views/file_validations/show.html.erb index e3d69c0f0..d3d53fde5 100644 --- a/app/views/file_validations/show.html.erb +++ b/app/views/file_validations/show.html.erb @@ -144,7 +144,7 @@ </div> <% content_for :sidebar do %> <ul class="actions"> - <li><%= link_to t('file_validations.actions.destroy'), file_validation_path(@file_validation), :method => :delete, :confirm => t('file_validations.actions.destroy_confirm'), :class => "remove" %></li> + <li><%= link_to t('file_validations.actions.destroy'), file_validation_path(@file_validation), :method => :delete, :data => {:confirm => t('file_validations.actions.destroy_confirm')}, :class => "remove" %></li> </ul> <%= render :partial => "test_sheet_toc" %> diff --git a/app/views/imports/_import.erb b/app/views/imports/_import.erb index 7723badc0..87e7c3190 100644 --- a/app/views/imports/_import.erb +++ b/app/views/imports/_import.erb @@ -7,7 +7,7 @@ <%= l import.created_at %> <div class="actions"> - <%= link_to t("actions.destroy"), referential_import_path(@referential, import), :method => :delete, :confirm => t('imports.actions.destroy_confirm'), :class => "remove" %> + <%= link_to t("actions.destroy"), referential_import_path(@referential, import), :method => :delete, :data => {:confirm => t('imports.actions.destroy_confirm')}, :class => "remove" %> </div> </div> <% end %> diff --git a/app/views/imports/show.html.erb b/app/views/imports/show.html.erb index fe2c89a39..d1c907b02 100644 --- a/app/views/imports/show.html.erb +++ b/app/views/imports/show.html.erb @@ -33,6 +33,6 @@ <% content_for :sidebar do %> <ul class="actions"> - <li><%= link_to t('imports.actions.destroy'), referential_import_path(@referential, @import), :method => :delete, :confirm => t('imports.actions.destroy_confirm'), :class => "remove" %></li> + <li><%= link_to t('imports.actions.destroy'), referential_import_path(@referential, @import), :method => :delete, :data => {:confirm => t('imports.actions.destroy_confirm')}, :class => "remove" %></li> </ul> <% end %> diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 7f465ca11..d18359ce0 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -1,5 +1,5 @@ # This file is copied to spec/ when you run 'rails generate rspec:install' -ENV["RAILS_ENV"] ||= 'test' +ENV["RAILS_ENV"] = 'test' require File.expand_path("../../config/environment", __FILE__) require 'rspec/rails' require 'rspec/autorun' |