diff --git a/app/views/wiki/date_index.html.erb b/app/views/wiki/date_index.html.erb index c382ed6e7..69a6960b4 100644 --- a/app/views/wiki/date_index.html.erb +++ b/app/views/wiki/date_index.html.erb @@ -3,6 +3,9 @@ <%= link_to l(:label_wiki_page_new), new_project_wiki_page_path(@project), :remote => true, :class => 'icon icon-add' %> <% end %> <%= watcher_link(@wiki, User.current) %> +<% if User.current.allowed_to?(:manage_wiki, @project) %> +<%= link_to l(:button_delete), {:controller => 'wikis', :action => 'destroy', :id => @project}, :class => 'icon icon-del' %> +<% end %>

<%= l(:label_index_by_date) %>

diff --git a/app/views/wiki/index.html.erb b/app/views/wiki/index.html.erb index 0d6955da1..bb6086874 100644 --- a/app/views/wiki/index.html.erb +++ b/app/views/wiki/index.html.erb @@ -3,6 +3,9 @@ <%= link_to l(:label_wiki_page_new), new_project_wiki_page_path(@project), :remote => true, :class => 'icon icon-add' %> <% end %> <%= watcher_link(@wiki, User.current) %> +<% if User.current.allowed_to?(:manage_wiki, @project) %> +<%= link_to l(:button_delete), {:controller => 'wikis', :action => 'destroy', :id => @project}, :class => 'icon icon-del' %> +<% end %>

<%= l(:label_index_by_title) %>

diff --git a/app/views/wikis/destroy.html.erb b/app/views/wikis/destroy.html.erb index 5afb676b2..d996da546 100644 --- a/app/views/wikis/destroy.html.erb +++ b/app/views/wikis/destroy.html.erb @@ -7,5 +7,6 @@ <%= form_tag({:controller => 'wikis', :action => 'destroy', :id => @project}) do %> <%= hidden_field_tag "confirm", 1 %> <%= submit_tag l(:button_delete) %> - <%= link_to l(:button_cancel), settings_project_path(@project, :tab => 'wiki') %> + <%= link_to l(:button_cancel), :back %> <% end %> +