diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-10-21 18:46:26 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-10-21 18:46:26 +0000 |
| commit | d66b3452db773e2d9faf2452595ab3e8d136d843 (patch) | |
| tree | 38ce910cf45c26789fdb1009f381aa1243e3d814 /app | |
| parent | 9ec142713d5eb4c2f45fec02d6062165efe312c7 (diff) | |
| download | redmine-d66b3452db773e2d9faf2452595ab3e8d136d843.tar.gz redmine-d66b3452db773e2d9faf2452595ab3e8d136d843.zip | |
Wiki page versions routes cleanup.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10687 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/application_helper.rb | 4 | ||||
| -rw-r--r-- | app/helpers/wiki_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/wiki/show.html.erb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c4b581255..e3126a358 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -234,7 +234,7 @@ module ApplicationHelper content << "<ul class=\"pages-hierarchy\">\n" pages[node].each do |page| content << "<li>" - content << link_to(h(page.pretty_title), {:controller => 'wiki', :action => 'show', :project_id => page.project, :id => page.title}, + content << link_to(h(page.pretty_title), {:controller => 'wiki', :action => 'show', :project_id => page.project, :id => page.title, :version => nil}, :title => (options[:timestamp] && page.updated_on ? l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)) : nil)) content << "\n" + render_page_hierarchy(pages, page.id, options) if pages[page.id] content << "</li>\n" @@ -644,7 +644,7 @@ module ApplicationHelper wiki_page_id = page.present? ? Wiki.titleize(page) : nil parent = wiki_page.nil? && obj.is_a?(WikiContent) && obj.page && project == link_project ? obj.page.title : nil url_for(:only_path => only_path, :controller => 'wiki', :action => 'show', :project_id => link_project, - :id => wiki_page_id, :anchor => anchor, :parent => parent) + :id => wiki_page_id, :version => nil, :anchor => anchor, :parent => parent) end end link_to(title.present? ? title.html_safe : h(page), url, :class => ('wiki-page' + (wiki_page ? '' : ' new'))) diff --git a/app/helpers/wiki_helper.rb b/app/helpers/wiki_helper.rb index 6edeabeb3..873ec1793 100644 --- a/app/helpers/wiki_helper.rb +++ b/app/helpers/wiki_helper.rb @@ -37,7 +37,7 @@ module WikiHelper def wiki_page_breadcrumb(page) breadcrumb(page.ancestors.reverse.collect {|parent| - link_to(h(parent.pretty_title), {:controller => 'wiki', :action => 'show', :id => parent.title, :project_id => parent.project}) + link_to(h(parent.pretty_title), {:controller => 'wiki', :action => 'show', :id => parent.title, :project_id => parent.project, :version => nil}) }) end end diff --git a/app/views/wiki/show.html.erb b/app/views/wiki/show.html.erb index a0aa3c04c..dfb4add7c 100644 --- a/app/views/wiki/show.html.erb +++ b/app/views/wiki/show.html.erb @@ -28,7 +28,7 @@ <%= link_to((l(:label_next) + " \xc2\xbb"), :action => 'show', :id => @page.title, :project_id => @page.project, :version => @content.next.version) + " - " if @content.next %> - <%= link_to(l(:label_current_version), :action => 'show', :id => @page.title, :project_id => @page.project) %> + <%= link_to(l(:label_current_version), :action => 'show', :id => @page.title, :project_id => @page.project, :version => nil) %> <br /> <em><%= @content.author ? link_to_user(@content.author) : l(:label_user_anonymous) %>, <%= format_time(@content.updated_on) %> </em><br /> |