From f9f7f3414aa9af6016623e5e7fdf2ecb940ec6ed Mon Sep 17 00:00:00 2001
From: Victor Costa <vfcosta@gmail.com>
Date: Wed, 23 Jul 2014 16:17:17 -0300
Subject: [PATCH] Fix article versioning page

---
 app/controllers/public/content_viewer_controller.rb | 2 +-
 app/views/content_viewer/article_versions.html.erb  | 2 +-
 config/routes.rb                                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/public/content_viewer_controller.rb b/app/controllers/public/content_viewer_controller.rb
index 4334747..d869a40 100644
--- a/app/controllers/public/content_viewer_controller.rb
+++ b/app/controllers/public/content_viewer_controller.rb
@@ -74,7 +74,7 @@ class ContentViewerController < ApplicationController
   end
 
   def versions_diff
-    path = params[:page].join('/')
+    path = params[:page]
     @page = profile.articles.find_by_path(path)
     @v1, @v2 = @page.versions.find_by_version(params[:v1]), @page.versions.find_by_version(params[:v2])
   end
diff --git a/app/views/content_viewer/article_versions.html.erb b/app/views/content_viewer/article_versions.html.erb
index 9d920c7..0b04e77 100644
--- a/app/views/content_viewer/article_versions.html.erb
+++ b/app/views/content_viewer/article_versions.html.erb
@@ -6,7 +6,7 @@
 
 <p><%= _('This is the list of all versions of this content. Select a version to see it and then revert to it.') %>.</p>
 
-<%= form_tag({:controller => 'content_viewer', :action => 'versions_diff', :profile => profile.identifier, :page => @page.path.split('/')}, :method => 'get') do %>
+<%= form_tag({:controller => 'content_viewer', :action => 'versions_diff', :profile => profile.identifier, :page => @page.path}, :method => 'get') do %>
   <ul id="article-versions">
     <% @versions.each do |v| %>
       <li>
diff --git a/config/routes.rb b/config/routes.rb
index 64e3955..5619ded 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -131,7 +131,7 @@ Noosfero::Application.routes.draw do
   match ':profile/*page/versions', :controller => 'content_viewer', :action => 'article_versions', :profile => /#{Noosfero.identifier_format}/, :constraints => EnvironmentDomainConstraint.new
   match '*page/versions', :controller => 'content_viewer', :action => 'article_versions'
 
-  match ':profile/*page/versions_diff', :controller => 'content_viewer', :action => 'versions_diff', :profile => /#{Noosfero.identifier_format}/, :conditions => { :if => lambda { |env| !Domain.hosting_profile_at(env[:host]) } }
+  match ':profile/*page/versions_diff', :controller => 'content_viewer', :action => 'versions_diff', :profile => /#{Noosfero.identifier_format}/, :constraints => EnvironmentDomainConstraint.new
   match '*page/versions_diff', :controller => 'content_viewer', :action => 'versions_diff'
 
   # match requests for profiles that don't have a custom domain
--
libgit2 0.21.2