Add new template to display versioned article

Also included revision number on cache key Signed-off-by: Daniela Feitosa (ActionItem2822)

Add new template to display versioned article
Also included revision number on cache key Signed-off-by: Daniela Feitosa (ActionItem2822)
Ana Losnak · Daniela Feitosa
1 parent 4ab1ad9c
Showing 4 changed files with 46 additions and 5 deletions Show diff stats
app/controllers/public/content_viewer_controller.rb
app/models/article.rb
app/views/content_viewer/versioned_article.rhtml
test/unit/article_test.rb
@@ -23,10 +23,6 @@ class ContentViewerController &lt; ApplicationController
           redirect_to profile.url.merge(:page => page_from_old_path.explode_path)
           return
         end
-      else
-        if version
-          @page = @page.versions.find_by_version version
-        end
       end
     end
@@ -48,6 +44,12 @@ class ContentViewerController &lt; ApplicationController
       return
     end
+    if version
+      @versioned_article = @page.versions.find_by_version(version)
+      render :template => 'content_viewer/versioned_article.rhtml'
+      return
+    end
+
     if request.xhr? && params[:toolbar]
       render :partial => 'article_toolbar'
       return
@@ -631,7 +631,9 @@ class Article &lt; ActiveRecord::Base
       (allow_post_content?(the_profile) ? "-owner" : '') +
       (params[:npage] ? "-npage-#{params[:npage]}" : '') +
       (params[:year] ? "-year-#{params[:year]}" : '') +
-      (params[:month] ? "-month-#{params[:month]}" : '')
+      (params[:month] ? "-month-#{params[:month]}" : '') +
+      (params[:rev] ? "-rev-#{params[:rev]}" : '')
+
   end
   def first_paragraph
@@ -0,0 +1,32 @@
+<div id="article" class="<%= @page.css_class_name %>">
+
+<div id="article-toolbar"><%= _("This is the revision %s of this content") % @versioned_article.version %></div>
+
+<% if @page.display_hits? || @page.license.present? %>
+  <div id='article-sub-header'>
+    <% if @versioned_article.license.present? %>
+      <div id="article-license">
+        <%= _('Licensed under %s') % (@versioned_article.license.url.present? ? link_to(@versioned_article.license.name, @versioned_article.license.url, :target => '_blank') : @versioned_article.license.name) %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
+
+<% cache(@page.cache_key(params, user, language)) do %>
+  <div class="<%="article-body article-body-" + @page.css_class_name %>">
+    <% options = @page.image? ? {:gallery_view => true} : {} %>
+    <%= article_to_html(@page, options) %>
+    <br style="clear:both" />
+  </div> <!-- end class="article-body" -->
+<% end %>
+
+
+<div id="article-versions">
+  <%= #TODO Review this %>
+  <%= @page.versions.map {|v| link_to("r#{v.version}", @page.url.merge(:rev => v.version))} %>
+</div>
+
+<%= display_source_info(@versioned_article) %>
+
+</div><!-- end id="article" -->
+<%= add_zoom_to_article_images %>
@@ -740,6 +740,11 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_match(/-year-2009-month-04/, a.cache_key(:year => '2009', :month => '04'))
   end
+ should 'use revision number to compose cache key' do
+    a = fast_create(Article, :name => 'Versioned article', :profile_id => profile.id)
+    assert_match(/-rev-2/,a.cache_key(:rev => 2))
+  end
+
   should 'not be highlighted by default' do
     a = Article.new
     assert !a.highlighted
@@ -0,0 +1,32 @@		@@ -0,0 +1,32 @@
	1	+<div id="article" class="<%= @page.css_class_name %>">
	2	+
	3	+<div id="article-toolbar"><%= _("This is the revision %s of this content") % @versioned_article.version %></div>
	4	+
	5	+<% if @page.display_hits? \|\| @page.license.present? %>
	6	+ <div id='article-sub-header'>
	7	+ <% if @versioned_article.license.present? %>
	8	+ <div id="article-license">
	9	+ <%= _('Licensed under %s') % (@versioned_article.license.url.present? ? link_to(@versioned_article.license.name, @versioned_article.license.url, :target => '_blank') : @versioned_article.license.name) %>
	10	+ </div>
	11	+ <% end %>
	12	+ </div>
	13	+<% end %>
	14	+
	15	+<% cache(@page.cache_key(params, user, language)) do %>
	16	+ <div class="<%="article-body article-body-" + @page.css_class_name %>">
	17	+ <% options = @page.image? ? {:gallery_view => true} : {} %>
	18	+ <%= article_to_html(@page, options) %>
	19	+ <br style="clear:both" />
	20	+ </div> <!-- end class="article-body" -->
	21	+<% end %>
	22	+
	23	+
	24	+<div id="article-versions">
	25	+ <%= #TODO Review this %>
	26	+ <%= @page.versions.map {\|v\| link_to("r#{v.version}", @page.url.merge(:rev => v.version))} %>
	27	+</div>
	28	+
	29	+<%= display_source_info(@versioned_article) %>
	30	+
	31	+</div><!-- end id="article" -->
	32	+<%= add_zoom_to_article_images %>