diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-07-07 14:36:49 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-07-07 14:36:49 +0000 |
| commit | 7b40767428ac5c04ba80d95c7c90b049c73c7f36 (patch) | |
| tree | 641733a4a56afead53aba5da5faba801d84c2c13 /app/views/projects | |
| parent | 56666a41b82d98a773d93dd8fa903a4d702b07ec (diff) | |
| download | redmine-7b40767428ac5c04ba80d95c7c90b049c73c7f36.tar.gz redmine-7b40767428ac5c04ba80d95c7c90b049c73c7f36.zip | |
Deprecated :confirm => 'Text' option.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9937 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/projects')
6 files changed, 6 insertions, 9 deletions
diff --git a/app/views/projects/settings/_activities.html.erb b/app/views/projects/settings/_activities.html.erb index 0331cc8ac..8c9a6121c 100644 --- a/app/views/projects/settings/_activities.html.erb +++ b/app/views/projects/settings/_activities.html.erb @@ -34,7 +34,7 @@ <div class="contextual"> <%= link_to(l(:button_reset), project_enumerations_path(@project), :method => :delete, - :confirm => l(:text_are_you_sure), + :data => {:confirm => l(:text_are_you_sure)}, :class => 'icon icon-del') %> </div> diff --git a/app/views/projects/settings/_boards.html.erb b/app/views/projects/settings/_boards.html.erb index 66a838a4e..c4b84ab99 100644 --- a/app/views/projects/settings/_boards.html.erb +++ b/app/views/projects/settings/_boards.html.erb @@ -20,7 +20,7 @@ <td class="buttons"> <% if User.current.allowed_to?(:manage_boards, @project) %> <%= link_to l(:button_edit), edit_project_board_path(@project, board), :class => 'icon icon-edit' %> - <%= link_to l(:button_delete), project_board_path(@project, board), :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del' %> + <%= delete_link project_board_path(@project, board) %> <% end %> </td> </tr> diff --git a/app/views/projects/settings/_issue_categories.html.erb b/app/views/projects/settings/_issue_categories.html.erb index f5ea6d0db..e88a85d50 100644 --- a/app/views/projects/settings/_issue_categories.html.erb +++ b/app/views/projects/settings/_issue_categories.html.erb @@ -14,7 +14,7 @@ <td class="buttons"> <% if User.current.allowed_to?(:manage_categories, @project) %> <%= link_to l(:button_edit), edit_issue_category_path(category), :class => 'icon icon-edit' %> - <%= link_to l(:button_delete), issue_category_path(category), :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del' %> + <%= delete_link issue_category_path(category) %> <% end %> </td> </tr> diff --git a/app/views/projects/settings/_members.html.erb b/app/views/projects/settings/_members.html.erb index 6bb07c69a..8ce9cf3de 100644 --- a/app/views/projects/settings/_members.html.erb +++ b/app/views/projects/settings/_members.html.erb @@ -41,7 +41,7 @@ l(:button_delete), { :url => membership_path(member), :method => :delete, - :confirm => (!User.current.admin? && member.include?(User.current) ? l(:text_own_membership_delete_confirmation) : nil) }, + :data => {:confirm => (!User.current.admin? && member.include?(User.current) ? l(:text_own_membership_delete_confirmation) : nil)} }, :title => l(:button_delete), :class => 'icon icon-del' ) if member.deletable? %> diff --git a/app/views/projects/settings/_repositories.html.erb b/app/views/projects/settings/_repositories.html.erb index c2581b38c..d72c9edad 100644 --- a/app/views/projects/settings/_repositories.html.erb +++ b/app/views/projects/settings/_repositories.html.erb @@ -22,10 +22,7 @@ :class => 'icon icon-user') %> <%= link_to(l(:button_edit), edit_repository_path(repository), :class => 'icon icon-edit') %> - <%= link_to(l(:button_delete), repository_path(repository), - :confirm => l(:text_are_you_sure), - :method => :delete, - :class => 'icon icon-del') %> + <%= delete_link repository_path(repository) %> <% end %> </td> </tr> diff --git a/app/views/projects/settings/_versions.html.erb b/app/views/projects/settings/_versions.html.erb index 306670587..778803bf3 100644 --- a/app/views/projects/settings/_versions.html.erb +++ b/app/views/projects/settings/_versions.html.erb @@ -21,7 +21,7 @@ <td class="buttons"> <% if version.project == @project && User.current.allowed_to?(:manage_versions, @project) %> <%= link_to l(:button_edit), edit_version_path(version), :class => 'icon icon-edit' %> - <%= link_to l(:button_delete), version_path(version), :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del' %> + <%= delete_link version_path(version) %> <% end %> </td> </tr> |