diff options
| -rw-r--r-- | app/views/projects/settings/_versions.rhtml | 4 | ||||
| -rw-r--r-- | app/views/versions/show.rhtml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/settings/_versions.rhtml b/app/views/projects/settings/_versions.rhtml index c8a5db1cf..f9a4dd109 100644 --- a/app/views/projects/settings/_versions.rhtml +++ b/app/views/projects/settings/_versions.rhtml @@ -6,7 +6,7 @@ <th><%= l(:field_description) %></th> <th><%= l(:field_status) %></th> <th><%= l(:field_sharing) %></th> - <th><%= l(:label_wiki_page) unless @project.wiki.nil? %></th> + <th><%= l(:label_wiki_page) %></th> <th style="width:15%"></th> </tr></thead> <tbody> @@ -17,7 +17,7 @@ <td class="description"><%=h version.description %></td> <td class="status"><%= l("version_status_#{version.status}") %></td> <td class="sharing"><%=h format_version_sharing(version.sharing) %></td> - <td><%= link_to(h(version.wiki_page_title), :controller => 'wiki', :action => 'show', :id => Wiki.titleize(version.wiki_page_title), :project_id => @project) unless version.wiki_page_title.blank? || @project.wiki.nil? %></td> + <td><%= link_to_if_authorized(h(version.wiki_page_title), {:controller => 'wiki', :action => 'show', :project_id => version.project, :id => Wiki.titleize(version.wiki_page_title)}) || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.project.wiki.nil? %></td> <td class="buttons"> <% 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 f8a82142c..13769a5b9 100644 --- a/app/views/versions/show.rhtml +++ b/app/views/versions/show.rhtml @@ -1,6 +1,6 @@ <div class="contextual"> <%= 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 => Wiki.titleize(@version.wiki_page_title)}, :class => 'icon icon-edit') unless @version.wiki_page_title.blank? || @project.wiki.nil? %> +<%= link_to_if_authorized(l(:button_edit_associated_wikipage, :page_title => @version.wiki_page_title), {:controller => 'wiki', :action => 'edit', :project_id => @version.project, :id => 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 }) %> </div> |