diff --git a/app/views/projects/settings/_versions.rhtml b/app/views/projects/settings/_versions.rhtml
index dc81f62..e75a6f3 100644
--- a/app/views/projects/settings/_versions.rhtml
+++ b/app/views/projects/settings/_versions.rhtml
@@ -6,7 +6,7 @@
@@ -17,7 +17,7 @@
<%=h version.description %> |
<%= l("version_status_#{version.status}") %> |
<%=h format_version_sharing(version.sharing) %> |
- <%= link_to(h(version.wiki_page_title), :controller => 'wiki', :page => Wiki.titleize(version.wiki_page_title)) unless version.wiki_page_title.blank? || @project.wiki.nil? %> |
+ <%= link_to_if_authorized(h(version.wiki_page_title), {:controller => 'wiki', :action => 'index', :id => version.project, :page => Wiki.titleize(version.wiki_page_title)}) || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.project.wiki.nil? %> |
<% if version.project == @project %>
<%= link_to_if_authorized l(:button_edit), {:controller => 'versions', :action => 'edit', :id => version }, :class => 'icon icon-edit' %>
diff --git a/app/views/versions/show.rhtml b/app/views/versions/show.rhtml
index 79de598..51d17a7 100644
--- a/app/views/versions/show.rhtml
+++ b/app/views/versions/show.rhtml
@@ -1,5 +1,6 @@
<%= link_to_if_authorized l(:button_edit), {:controller => 'versions', :action => 'edit', :id => @version}, :class => 'icon icon-edit' %>
+<%= link_to_if_authorized(l(:button_edit_associated_wikipage, :page_title => @version.wiki_page_title), {:controller => 'wiki', :action => 'edit', :id => @version.project, :page => Wiki.titleize(@version.wiki_page_title)}, :class => 'icon icon-edit') unless @version.wiki_page_title.blank? || @version.project.wiki.nil? %>
<%= call_hook(:view_versions_show_contextual, { :version => @version, :project => @project }) %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7bdb6ae..0ff7eeb 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -820,6 +820,7 @@ en:
button_quote: Quote
button_duplicate: Duplicate
button_show: Show
+ button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
status_active: active
status_registered: registered
|