Merge remote-tracking branch 'dani/AI2822-fixes' into AI2822-fixes

Conflicts: public/stylesheets/application.css

Merge remote-tracking branch 'dani/AI2822-fixes' into AI2822-fixes
Conflicts: public/stylesheets/application.css
Rodrigo Souto
2 parents 32df4672 35d7a6af
Showing 18 changed files with 355 additions and 25 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/controllers/public/content_viewer_controller.rb
app/helpers/application_helper.rb
app/helpers/article_helper.rb
app/models/article.rb
app/models/text_article.rb
app/views/content_viewer/_article_toolbar.rhtml
app/views/content_viewer/article_versions.rhtml
app/views/content_viewer/versioned_article.rhtml
config/routes.rb
features/article_versioning.feature
features/step_definitions/noosfero_steps.rb
public/designs/icons/tango/style.css
public/stylesheets/application.css
test/functional/cms_controller_test.rb
test/functional/content_viewer_controller_test.rb
test/integration/routing_test.rb
test/unit/article_test.rb
@@ -68,6 +68,9 @@ class CmsController &lt; MyProfileController
   def edit
     @success_back_to = params[:success_back_to]
     @article = profile.articles.find(params[:id])
+    version = params[:version]
+    @article.revert_to(version) if version
+
     @parent_id = params[:parent_id]
     @type = params[:type] || @article.class.to_s
     translations if @article.translatable?
@@ -7,6 +7,7 @@ class ContentViewerController &lt; ApplicationController
   def view_page
     path = params[:page].join('/')
+    @version = params[:version].to_i
     if path.blank?
       @page = profile.home_page
@@ -25,22 +26,15 @@ class ContentViewerController &lt; ApplicationController
       end
     end
-    if !@page.nil? && !@page.display_to?(user)
-      if !profile.public?
-        private_profile_partial_parameters
-        render :template => 'profile/_private_profile.rhtml', :status => 403
-      else #if !profile.visible?
-        message = _('You are not allowed to view this content.')
-        message += ' ' + _('You can contact the owner of this profile to request access then.')
-        render_access_denied(message)
-      end
-      return
-    end
+    return unless allow_access_to_page(path)
-    # page not found, give error
-    if @page.nil?
-      render_not_found(@path)
-      return
+    if @version > 0
+      return render_access_denied unless @page.display_versions?
+      @versioned_article = @page.versions.find_by_version(@version)
+      if @versioned_article && @page.versions.latest.version != @versioned_article.version
+        render :template => 'content_viewer/versioned_article.rhtml'
+        return
+      end
     end
     if request.xhr? && params[:toolbar]
@@ -128,6 +122,15 @@ class ContentViewerController &lt; ApplicationController
     end
   end
+  def article_versions
+    path = params[:page].join('/')
+    @page = profile.articles.find_by_path(path)
+    return unless allow_access_to_page(path)
+
+    render_access_denied unless @page.display_versions?
+    @versions = @page.versions.paginate(:per_page => per_page, :page => params[:npage])
+  end
+
   protected
   def per_page
@@ -158,4 +161,22 @@ class ContentViewerController &lt; ApplicationController
   end
   helper_method :pass_without_comment_captcha?
+  def allow_access_to_page(path)
+    allowed = true
+    if @page.nil? # page not found, give error
+      render_not_found(path)
+      allowed = false
+    elsif !@page.display_to?(user)
+      if !profile.public?
+        private_profile_partial_parameters
+        render :template => 'profile/_private_profile.rhtml', :status => 403
+        allowed = false
+      else #if !profile.visible?
+        render_access_denied
+        allowed = false
+      end
+    end
+    allowed
+  end
+
 end
@@ -1404,4 +1404,8 @@ module ApplicationHelper
     content.nil? ? '' : content.id.to_s
   end
+  def display_article_versions(article, version = nil)
+    content_tag('ul', article.versions.map {|v| link_to("r#{v.version}", @page.url.merge(:version => v.version))})
+  end
+
 end
@@ -28,7 +28,7 @@ module ArticleHelper
         'div',
         check_box(:article, :notify_comments) +
         content_tag('label', _('I want to receive a notification of each comment written by e-mail'), :for => 'article_notify_comments') +
-        observe_field(:article_accept_comments, :function => "$('article_notify_comments').disabled = ! $('article_accept_comments').checked;$('article_moderate_comments').disabled = ! $('article_accept_comments').checked") 
+        observe_field(:article_accept_comments, :function => "$('article_notify_comments').disabled = ! $('article_accept_comments').checked;$('article_moderate_comments').disabled = ! $('article_accept_comments').checked")
       ) +
       content_tag(
@@ -42,7 +42,15 @@ module ArticleHelper
         'div',
         check_box(:article, :display_hits) +
         content_tag('label', _('I want this article to display the number of hits it received'), :for => 'article_display_hits')
+      ) : '') +
+
+      (article.can_display_versions? ?
+      content_tag(
+        'div',
+        check_box(:article, :display_versions) +
+        content_tag('label', _('I want this article to display a link to older versions'), :for => 'article_display_versions')
       ) : '')
+
     )
   end
@@ -201,6 +201,7 @@ class Article &lt; ActiveRecord::Base
   acts_as_filesystem
   acts_as_versioned
+  self.non_versioned_columns << 'setting'
   def comment_data
     comments.map {|item| [item.title, item.body].join(' ') }.join(' ')
@@ -604,17 +605,34 @@ class Article &lt; ActiveRecord::Base
     false
   end
-  def author
-    if versions.empty?
-      last_changed_by
-    else
-      author_id = versions.first.last_changed_by_id
+  settings_items :display_versions, :type => :boolean, :default => false
+
+  def can_display_versions?
+    false
+  end
+
+  def display_versions?
+    can_display_versions? && display_versions
+  end
+
+  def author(version_number = nil)
+    if version_number
+      version = versions.find_by_version(version_number)
+      author_id = version.last_changed_by_id if version
       Person.exists?(author_id) ? Person.find(author_id) : nil
+    else
+      if versions.empty?
+        last_changed_by
+      else
+        author_id = versions.first.last_changed_by_id
+        Person.exists?(author_id) ? Person.find(author_id) : nil
+      end
     end
   end
-  def author_name
-    author ? author.name : (setting[:author_name] || _('Unknown'))
+  def author_name(version_number = nil)
+    person = version_number ? author(version_number) : author
+    person ? person.name : (setting[:author_name] || _('Unknown'))
   end
   def author_url
@@ -625,13 +643,20 @@ class Article &lt; ActiveRecord::Base
     author ? author.id : nil
   end
+  def version_license(version_number = nil)
+    return license if version_number.nil?
+    profile.environment.licenses.find_by_id(versions.find_by_version(version_number).license_id)
+  end
+
   alias :active_record_cache_key :cache_key
   def cache_key(params = {}, the_profile = nil, language = 'en')
     active_record_cache_key+'-'+language +
       (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[:version] ? "-version-#{params[:version]}" : '')
+
   end
   def first_paragraph
@@ -17,4 +17,7 @@ class TextArticle &lt; Article
     end
   end
+  def can_display_versions?
+    true
+  end
 end
@@ -48,6 +48,10 @@
       <%= expirable_button @page, :suggest, content, url, options %>
     <% end %>
+    <% if @page.display_versions? %>
+      <%= button(:clock, _('All versions'), {:controller => 'content_viewer', :profile => profile.identifier, :action => 'article_versions'}, :id => 'article-versions-link') %>
+    <% end %>
+
     <%= report_abuse(profile, :link, @page) %>
   </div>
@@ -0,0 +1,16 @@
+<%= article_title(@page, :no_link => true) %>
+
+<p><%= _('This is the list of all versions of this content. Select a version to see it and then revert to it.') %>.</p>
+
+<ul class='article-versions'>
+  <% @versions.each do |v| %>
+    <li>
+      <%= link_to(_("Version #{v.version}"), @page.url.merge(:version => v.version)) %>
+      <%= @page.version == v.version ? _('(current)') : '' %>
+      <span class='updated-by'><%= _('by %{author}') % {:author => link_to(@page.author_name(v.version), @page.author_url)} %></span>
+      <div class='updated-on'><%= show_time(v.updated_at) %></div>
+    </li>
+  <% end %>
+</ul>
+
+<%= pagination_links @versions, :param_name => 'npage' %>
@@ -0,0 +1,38 @@
+<div id="article" class="<%= @page.css_class_name %>">
+
+  <div id="article-actions">
+    <%= button(:clock, _('All versions'), {:controller => 'content_viewer', :profile => profile.identifier, :action => 'article_versions'}, :id => 'article-versions-link') %>
+
+    <% if @page.allow_edit?(user) && !remove_content_button(:edit) %>
+      <% content = content_tag('span', _('Revert to this version')) %>
+      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id, :version => @version }) %>
+      <%= expirable_button @page, :edit, content, url, :id => 'article-revert-version-link' %>
+    <% end %>
+  </div>
+
+  <div id="article-header">
+    <h1 class='title'><%= @versioned_article.name %></h1>
+    <%= _("Version %{version} - %{author} on %{date}") % {:version => @version, :author => @page.author_name(@version), :date => show_time(@versioned_article.updated_at) } %>
+  </div>
+
+  <% if @page.version_license(@version).present? %>
+    <div id='article-sub-header'>
+      <% if @page.version_license(@version).present? %>
+        <div id="article-license">
+          <%= _('Licensed under %s') % (@page.version_license(@version).url.present? ? link_to(@page.version_license(@version).name, @page.version_license(@version).url, :target => '_blank') : @page.version_license(@version).name) %>
+        </div>
+      <% end %>
+    </div>
+  <% end %>
+
+  <% cache(@page.cache_key(params, user, language)) do %>
+    <div class="<%="article-body article-body-" + @page.css_class_name %>">
+      <%= @versioned_article.body %>
+      <br style="clear:both" />
+    </div> <!-- end class="article-body" -->
+  <% end %>
+
+  <%= display_source_info(@page) %>
+
+</div><!-- end id="article" -->
+<%= add_zoom_to_article_images %>
@@ -126,12 +126,14 @@ ActionController::Routing::Routes.draw do |map|
   # cache stuff - hack
   map.cache 'public/:action/:id', :controller => 'public'
+  map.connect ':profile/*page/versions', :controller => 'content_viewer', :action => 'article_versions', :profile => /#{Noosfero.identifier_format}/, :conditions => { :if => lambda { |env| !Domain.hosting_profile_at(env[:host]) } }
+  map.connect '*page/versions', :controller => 'content_viewer', :action => 'article_versions'
   # match requests for profiles that don't have a custom domain
   map.homepage ':profile/*page', :controller => 'content_viewer', :action => 'view_page', :profile => /#{Noosfero.identifier_format}/, :conditions => { :if => lambda { |env| !Domain.hosting_profile_at(env[:host]) } }
-
   # match requests for content in domains hosted for profiles
   map.connect '*page', :controller => 'content_viewer', :action => 'view_page'
+
 end
@@ -0,0 +1,87 @@
+Feature: article versioning
+  As a user
+  I want to see article versions
+  In order to be able to change between versions of an article
+
+  Background:
+    Given the following users
+      | login     | name       |
+      | joaosilva | Joao Silva |
+    And "joaosilva" has no articles
+    And the following articles
+      | owner     | name           | body                                     | display_versions |
+      | joaosilva | Sample Article | This is the first version of the article | true             |
+    And the article "Sample Article" is updated with
+      | name           | body                                      |
+      | Edited Article | This is the second version of the article |
+    And I am logged in as "joaosilva"
+
+  @selenium
+  Scenario: enabling visualization of versions
+    Given the following articles
+      | owner     | name        | body                       |
+      | joaosilva | New Article | Article to enable versions |
+   Given I am on article "New Article"
+    Then I should not see "All versions"
+    When I follow "Edit" within "#article-actions"
+    And I check "I want this article to display a link to older versions"
+    And I press "Save"
+    Then I should be on article "New Article"
+    And I should see "All versions"
+
+  @selenium
+  Scenario: list versions of an article
+    Given I am on article "Edited Article"
+    When I follow "All versions"
+    Then I should be on /joaosilva/edited-article/versions
+    And I should see "Version 1" within ".article-versions"
+    And I should see "Version 2" within ".article-versions"
+
+  @selenium
+  Scenario: see specific version
+    Given I go to article "Edited Article"
+    Then I should see "Edited Article" within ".title"
+    And I should see "This is the second version of the article" within ".article-body"
+    When I follow "All versions"
+    And I follow "Version 1"
+    Then I should see "Sample Article" within ".title"
+    And I should see "This is the first version of the article" within ".article-body"
+
+  @selenium
+  Scenario: revert to a specific version generates a new version
+    Given I go to article "Edited Article"
+    When I follow "All versions"
+    Then I should not see "Version 3" within ".article-versions"
+    And I follow "Version 1"
+    And I follow "Revert to this version"
+    And I press "Save"
+    Then I should see "Sample Article" within ".title"
+    When I follow "All versions"
+    Then I should see "Version 3" within ".article-versions"
+
+  Scenario: try to access versions of unexistent article
+    Given I go to /joaosilva/unexistent-article/versions
+    Then I should see "There is no such page"
+
+  Scenario: deny access to versions when disabled on article
+    Given the following articles
+      | owner     | name              | body                        | display_versions |
+      | joaosilva | Versions disabled | Versions can't be displayed | false            |
+    And I go to /joaosilva/versions-disabled/versions
+    Then I should see "Access denied"
+
+  Scenario: deny access to specific version when disabled on article and not logged
+    Given the article "Edited Article" is updated with
+      | display_versions |
+      | false            |
+    And I am not logged in
+    And I go to /joaosilva/edited-article?version=1
+    Then I should see "Access denied"
+
+  Scenario: deny access to specific version when disabled, private and not logged
+    Given the article "Edited Article" is updated with
+      | display_versions | published |
+      | false            | false     |
+    And I am not logged in
+    And I go to /joaosilva/edited-article?version=1
+    Then I should see "Access denied"
@@ -687,6 +687,14 @@ Given /^the article &quot;([^\&quot;]*)&quot; is updated by &quot;([^\&quot;]*)&quot;$/ do |article, person|
   a.save!
 end
+Given /^the article "([^\"]*)" is updated with$/ do |article, table|
+  a = Article.find_by_name article
+
+  row = table.hashes.first
+    
+  a.update_attributes(row)
+end
+
 Given /^the cache is turned (on|off)$/ do |state|
   ActionController::Base.perform_caching = (state == 'on')
 end
@@ -105,6 +105,7 @@
 .icon-deactivate-user         { background-image: url(Tango/16x16/emblems/emblem-unreadable.png) }
 .icon-set-admin-role          { background-image: url(mod/16x16/apps/user.png) }
 .icon-reset-admin-role        { background-image: url(/images/icons-app/person-icon.png) }
+.icon-clock        { background-image: url(Tango/16x16/actions/appointment.png) }
 /******************LARGE ICONS********************/
 .image-gallery-item .folder  { background-image: url(mod/96x96/places/folder.png) }
@@ -6466,3 +6466,15 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
   width: 100px;
   text-align: center;
 }
+
+#product-list .highlighted img.star {
+  position: absolute;
+  top: 2px;
+  right: 2px;
+  z-index: 1;
+}
+
+ul.article-versions li {
+  font-size: 13px;
+  padding: 3px 0px;
+}
@@ -1719,6 +1719,23 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_redirected_to '/'
   end
+  should 'edit article with content from older version' do
+    article = profile.articles.create(:name => 'first version')
+    article.name = 'second version'; article.save
+
+    get :edit, :profile => profile.identifier, :id => article.id, :version => 1
+    assert_equal 'second version', Article.find(article.id).name
+    assert_equal 'first version', assigns(:article).name
+  end
+
+  should 'save article with content from older version' do
+    article = profile.articles.create(:name => 'first version')
+    article.name = 'second version'; article.save
+
+    post :edit, :profile => profile.identifier, :id => article.id, :version => 1
+    assert_equal 'first version', Article.find(article.id).name
+  end
+
   protected
   # FIXME this is to avoid adding an extra dependency for a proper JSON parser.
@@ -369,6 +369,35 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_redirected_to :host => p.default_hostname, :controller => 'content_viewer', :action => 'view_page', :profile => p.identifier, :page => a2.explode_path
   end
+  should "display current article's versions" do
+    page = TextArticle.create!(:name => 'myarticle', :body => 'test article', :display_versions => true, :profile => profile)
+    page.body = 'test article edited'; page.save
+
+    get :article_versions, :profile => profile.identifier, :page => [ 'myarticle' ]
+    assert_tag :tag => 'ul', :attributes => { :class => 'article-versions' }, :descendant => {
+      :tag => 'a',
+      :attributes => { :href => "http://#{profile.environment.default_hostname}/#{profile.identifier}/#{page.path}?version=1" }
+    }
+  end
+
+  should "fetch correct article version" do
+    page = TextArticle.create!(:name => 'myarticle', :body => 'original article', :display_versions => true, :profile => profile)
+    page.body = 'edited article'; page.save
+
+    get :view_page, :profile => profile.identifier, :page => [ 'myarticle' ], :version => 1
+
+    assert_tag :tag => 'div', :attributes => { :class => /article-body/ }, :content => /original article/
+  end
+
+  should "display current article if version does not exist" do
+    page = TextArticle.create!(:name => 'myarticle', :body => 'original article', :display_versions => true, :profile => profile)
+    page.body = 'edited article'; page.save
+
+    get :view_page, :profile => profile.identifier, :page => [ 'myarticle' ], :version => 'bli'
+
+    assert_tag :tag => 'div', :attributes => { :class => /article-body/ }, :content => /edited article/
+  end
+
   should 'not return an article of a different user' do
     p1 = create_user('test_user').person
     a = p1.articles.create!(:name => 'old-name')
@@ -256,4 +256,19 @@ class RoutingTest &lt; ActionController::IntegrationTest
     assert_recognizes({:controller => 'not_found', :action => 'nothing', :stuff => ['aksdhf']}, '/user_themes/aksdhf')
   end
+  should 'have route to versions of an article' do
+
+    assert_routing('/ze/work/free-software/versions', :controller => 'content_viewer', :action => 'article_versions', :profile => 'ze', :page => ['work', "free-software"])
+  end
+
+  should 'have route to versions of an article if profile has domain' do
+    user = create_user('testuser').person
+    domain = Domain.create!(:name => 'example.com', :owner => user)
+
+    ActionController::TestRequest.any_instance.expects(:host).returns('www.example.com')
+
+    assert_routing('/work/free-software/versions', :controller => 'content_viewer', :action =>  'article_versions', :page => [ 'work', 'free-software'] )
+  end
+
+
 end
@@ -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(/-version-2/,a.cache_key(:version => 2))
+  end
+
   should 'not be highlighted by default' do
     a = Article.new
     assert !a.highlighted
@@ -1688,6 +1693,16 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_equal license, article.license
   end
+  should 'return license from a specific version' do
+    cc = License.create!(:name => 'CC (by)', :environment => Environment.default)
+    gpl = License.create!(:name => 'GPLv3', :environment => Environment.default)
+    article = Article.create!(:name => 'first version', :profile => profile, :license => cc)
+    article.license = gpl
+    article.save
+    assert_equal cc, article.version_license(1)
+    assert_equal gpl, article.version_license(2)
+  end
+
   should 'update path if parent is changed' do
     f1 = Folder.create!(:name => 'Folder 1', :profile => profile)
     f2 = Folder.create!(:name => 'Folder 2', :profile => profile)
@@ -1746,6 +1761,28 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_nil article.author_id
   end
+  should "return the author of a specific version" do
+    author1 = fast_create(Person)
+    author2 = fast_create(Person)
+    article = Article.create!(:name => 'first version', :profile => profile, :last_changed_by => author1)
+    article.name = 'second version'
+    article.last_changed_by = author2
+    article.save
+    assert_equal author1, article.author(1)
+    assert_equal author2, article.author(2)
+  end
+
+  should "return the author_name of a specific version" do
+    author1 = fast_create(Person)
+    author2 = fast_create(Person)
+    article = Article.create!(:name => 'first version', :profile => profile, :last_changed_by => author1)
+    article.name = 'second version'
+    article.last_changed_by = author2
+    article.save
+    assert_equal author1.name, article.author_name(1)
+    assert_equal author2.name, article.author_name(2)
+  end
+
   should 'identify if belongs to forum' do
     p = create_user('user_forum_test').person
     forum = fast_create(Forum, :name => 'Forum test', :profile_id => p.id)
	@@ -1404,4 +1404,8 @@ module ApplicationHelper		@@ -1404,4 +1404,8 @@ module ApplicationHelper
1404	content.nil? ? '' : content.id.to_s	1404	content.nil? ? '' : content.id.to_s
1405	end	1405	end
1406		1406
		1407	+ def display_article_versions(article, version = nil)
		1408	+ content_tag('ul', article.versions.map {\|v\| link_to("r#{v.version}", @page.url.merge(:version => v.version))})
		1409	+ end
		1410	+
1407	end	1411	end
	@@ -17,4 +17,7 @@ class TextArticle < Article		@@ -17,4 +17,7 @@ class TextArticle < Article
17	end	17	end
18	end	18	end
19		19
		20	+ def can_display_versions?
		21	+ true
		22	+ end
20	end	23	end
@@ -0,0 +1,16 @@		@@ -0,0 +1,16 @@
	1	+<%= article_title(@page, :no_link => true) %>
	2	+
	3	+<p><%= _('This is the list of all versions of this content. Select a version to see it and then revert to it.') %>.</p>
	4	+
	5	+<ul class='article-versions'>
	6	+ <% @versions.each do \|v\| %>
	7	+ <li>
	8	+ <%= link_to(_("Version #{v.version}"), @page.url.merge(:version => v.version)) %>
	9	+ <%= @page.version == v.version ? _('(current)') : '' %>
	10	+ <span class='updated-by'><%= _('by %{author}') % {:author => link_to(@page.author_name(v.version), @page.author_url)} %></span>
	11	+ <div class='updated-on'><%= show_time(v.updated_at) %></div>
	12	+ </li>
	13	+ <% end %>
	14	+</ul>
	15	+
	16	+<%= pagination_links @versions, :param_name => 'npage' %>
@@ -0,0 +1,38 @@		@@ -0,0 +1,38 @@
	1	+<div id="article" class="<%= @page.css_class_name %>">
	2	+
	3	+ <div id="article-actions">
	4	+ <%= button(:clock, _('All versions'), {:controller => 'content_viewer', :profile => profile.identifier, :action => 'article_versions'}, :id => 'article-versions-link') %>
	5	+
	6	+ <% if @page.allow_edit?(user) && !remove_content_button(:edit) %>
	7	+ <% content = content_tag('span', _('Revert to this version')) %>
	8	+ <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'edit', :id => @page.id, :version => @version }) %>
	9	+ <%= expirable_button @page, :edit, content, url, :id => 'article-revert-version-link' %>
	10	+ <% end %>
	11	+ </div>
	12	+
	13	+ <div id="article-header">
	14	+ <h1 class='title'><%= @versioned_article.name %></h1>
	15	+ <%= _("Version %{version} - %{author} on %{date}") % {:version => @version, :author => @page.author_name(@version), :date => show_time(@versioned_article.updated_at) } %>
	16	+ </div>
	17	+
	18	+ <% if @page.version_license(@version).present? %>
	19	+ <div id='article-sub-header'>
	20	+ <% if @page.version_license(@version).present? %>
	21	+ <div id="article-license">
	22	+ <%= _('Licensed under %s') % (@page.version_license(@version).url.present? ? link_to(@page.version_license(@version).name, @page.version_license(@version).url, :target => '_blank') : @page.version_license(@version).name) %>
	23	+ </div>
	24	+ <% end %>
	25	+ </div>
	26	+ <% end %>
	27	+
	28	+ <% cache(@page.cache_key(params, user, language)) do %>
	29	+ <div class="<%="article-body article-body-" + @page.css_class_name %>">
	30	+ <%= @versioned_article.body %>
	31	+ <br style="clear:both" />
	32	+ </div> <!-- end class="article-body" -->
	33	+ <% end %>
	34	+
	35	+ <%= display_source_info(@page) %>
	36	+
	37	+</div><!-- end id="article" -->
	38	+<%= add_zoom_to_article_images %>
@@ -0,0 +1,87 @@		@@ -0,0 +1,87 @@
	1	+Feature: article versioning
	2	+ As a user
	3	+ I want to see article versions
	4	+ In order to be able to change between versions of an article
	5	+
	6	+ Background:
	7	+ Given the following users
	8	+ \| login \| name \|
	9	+ \| joaosilva \| Joao Silva \|
	10	+ And "joaosilva" has no articles
	11	+ And the following articles
	12	+ \| owner \| name \| body \| display_versions \|
	13	+ \| joaosilva \| Sample Article \| This is the first version of the article \| true \|
	14	+ And the article "Sample Article" is updated with
	15	+ \| name \| body \|
	16	+ \| Edited Article \| This is the second version of the article \|
	17	+ And I am logged in as "joaosilva"
	18	+
	19	+ @selenium
	20	+ Scenario: enabling visualization of versions
	21	+ Given the following articles
	22	+ \| owner \| name \| body \|
	23	+ \| joaosilva \| New Article \| Article to enable versions \|
	24	+ Given I am on article "New Article"
	25	+ Then I should not see "All versions"
	26	+ When I follow "Edit" within "#article-actions"
	27	+ And I check "I want this article to display a link to older versions"
	28	+ And I press "Save"
	29	+ Then I should be on article "New Article"
	30	+ And I should see "All versions"
	31	+
	32	+ @selenium
	33	+ Scenario: list versions of an article
	34	+ Given I am on article "Edited Article"
	35	+ When I follow "All versions"
	36	+ Then I should be on /joaosilva/edited-article/versions
	37	+ And I should see "Version 1" within ".article-versions"
	38	+ And I should see "Version 2" within ".article-versions"
	39	+
	40	+ @selenium
	41	+ Scenario: see specific version
	42	+ Given I go to article "Edited Article"
	43	+ Then I should see "Edited Article" within ".title"
	44	+ And I should see "This is the second version of the article" within ".article-body"
	45	+ When I follow "All versions"
	46	+ And I follow "Version 1"
	47	+ Then I should see "Sample Article" within ".title"
	48	+ And I should see "This is the first version of the article" within ".article-body"
	49	+
	50	+ @selenium
	51	+ Scenario: revert to a specific version generates a new version
	52	+ Given I go to article "Edited Article"
	53	+ When I follow "All versions"
	54	+ Then I should not see "Version 3" within ".article-versions"
	55	+ And I follow "Version 1"
	56	+ And I follow "Revert to this version"
	57	+ And I press "Save"
	58	+ Then I should see "Sample Article" within ".title"
	59	+ When I follow "All versions"
	60	+ Then I should see "Version 3" within ".article-versions"
	61	+
	62	+ Scenario: try to access versions of unexistent article
	63	+ Given I go to /joaosilva/unexistent-article/versions
	64	+ Then I should see "There is no such page"
	65	+
	66	+ Scenario: deny access to versions when disabled on article
	67	+ Given the following articles
	68	+ \| owner \| name \| body \| display_versions \|
	69	+ \| joaosilva \| Versions disabled \| Versions can't be displayed \| false \|
	70	+ And I go to /joaosilva/versions-disabled/versions
	71	+ Then I should see "Access denied"
	72	+
	73	+ Scenario: deny access to specific version when disabled on article and not logged
	74	+ Given the article "Edited Article" is updated with
	75	+ \| display_versions \|
	76	+ \| false \|
	77	+ And I am not logged in
	78	+ And I go to /joaosilva/edited-article?version=1
	79	+ Then I should see "Access denied"
	80	+
	81	+ Scenario: deny access to specific version when disabled, private and not logged
	82	+ Given the article "Edited Article" is updated with
	83	+ \| display_versions \| published \|
	84	+ \| false \| false \|
	85	+ And I am not logged in
	86	+ And I go to /joaosilva/edited-article?version=1
	87	+ Then I should see "Access denied"
	@@ -687,6 +687,14 @@ Given /^the article "([^\"])" is updated by "([^\"])"$/ do \|article, person\|		@@ -687,6 +687,14 @@ Given /^the article "([^\"])" is updated by "([^\"])"$/ do \|article, person\|
687	a.save!	687	a.save!
688	end	688	end
689		689
		690	+Given /^the article "([^\"]*)" is updated with$/ do \|article, table\|
		691	+ a = Article.find_by_name article
		692	+
		693	+ row = table.hashes.first
		694	+
		695	+ a.update_attributes(row)
		696	+end
		697	+
690	Given /^the cache is turned (on\|off)$/ do \|state\|	698	Given /^the cache is turned (on\|off)$/ do \|state\|
691	ActionController::Base.perform_caching = (state == 'on')	699	ActionController::Base.perform_caching = (state == 'on')
692	end	700	end
	@@ -105,6 +105,7 @@		@@ -105,6 +105,7 @@
105	.icon-deactivate-user { background-image: url(Tango/16x16/emblems/emblem-unreadable.png) }	105	.icon-deactivate-user { background-image: url(Tango/16x16/emblems/emblem-unreadable.png) }
106	.icon-set-admin-role { background-image: url(mod/16x16/apps/user.png) }	106	.icon-set-admin-role { background-image: url(mod/16x16/apps/user.png) }
107	.icon-reset-admin-role { background-image: url(/images/icons-app/person-icon.png) }	107	.icon-reset-admin-role { background-image: url(/images/icons-app/person-icon.png) }
		108	+.icon-clock { background-image: url(Tango/16x16/actions/appointment.png) }
108		109
109	/****************LARGE ICONS******************/	110	/****************LARGE ICONS******************/
110	.image-gallery-item .folder { background-image: url(mod/96x96/places/folder.png) }	111	.image-gallery-item .folder { background-image: url(mod/96x96/places/folder.png) }
	@@ -6466,3 +6466,15 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {		@@ -6466,3 +6466,15 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
6466	width: 100px;	6466	width: 100px;
6467	text-align: center;	6467	text-align: center;
6468	}	6468	}
		6469	+
		6470	+#product-list .highlighted img.star {
		6471	+ position: absolute;
		6472	+ top: 2px;
		6473	+ right: 2px;
		6474	+ z-index: 1;
		6475	+}
		6476	+
		6477	+ul.article-versions li {
		6478	+ font-size: 13px;
		6479	+ padding: 3px 0px;
		6480	+}
	@@ -1719,6 +1719,23 @@ class CmsControllerTest < ActionController::TestCase		@@ -1719,6 +1719,23 @@ class CmsControllerTest < ActionController::TestCase
1719	assert_redirected_to '/'	1719	assert_redirected_to '/'
1720	end	1720	end
1721		1721
		1722	+ should 'edit article with content from older version' do
		1723	+ article = profile.articles.create(:name => 'first version')
		1724	+ article.name = 'second version'; article.save
		1725	+
		1726	+ get :edit, :profile => profile.identifier, :id => article.id, :version => 1
		1727	+ assert_equal 'second version', Article.find(article.id).name
		1728	+ assert_equal 'first version', assigns(:article).name
		1729	+ end
		1730	+
		1731	+ should 'save article with content from older version' do
		1732	+ article = profile.articles.create(:name => 'first version')
		1733	+ article.name = 'second version'; article.save
		1734	+
		1735	+ post :edit, :profile => profile.identifier, :id => article.id, :version => 1
		1736	+ assert_equal 'first version', Article.find(article.id).name
		1737	+ end
		1738	+
1722	protected	1739	protected
1723		1740
1724	# FIXME this is to avoid adding an extra dependency for a proper JSON parser.	1741	# FIXME this is to avoid adding an extra dependency for a proper JSON parser.
	@@ -369,6 +369,35 @@ class ContentViewerControllerTest < ActionController::TestCase		@@ -369,6 +369,35 @@ class ContentViewerControllerTest < ActionController::TestCase
369	assert_redirected_to :host => p.default_hostname, :controller => 'content_viewer', :action => 'view_page', :profile => p.identifier, :page => a2.explode_path	369	assert_redirected_to :host => p.default_hostname, :controller => 'content_viewer', :action => 'view_page', :profile => p.identifier, :page => a2.explode_path
370	end	370	end
371		371
		372	+ should "display current article's versions" do
		373	+ page = TextArticle.create!(:name => 'myarticle', :body => 'test article', :display_versions => true, :profile => profile)
		374	+ page.body = 'test article edited'; page.save
		375	+
		376	+ get :article_versions, :profile => profile.identifier, :page => [ 'myarticle' ]
		377	+ assert_tag :tag => 'ul', :attributes => { :class => 'article-versions' }, :descendant => {
		378	+ :tag => 'a',
		379	+ :attributes => { :href => "http://#{profile.environment.default_hostname}/#{profile.identifier}/#{page.path}?version=1" }
		380	+ }
		381	+ end
		382	+
		383	+ should "fetch correct article version" do
		384	+ page = TextArticle.create!(:name => 'myarticle', :body => 'original article', :display_versions => true, :profile => profile)
		385	+ page.body = 'edited article'; page.save
		386	+
		387	+ get :view_page, :profile => profile.identifier, :page => [ 'myarticle' ], :version => 1
		388	+
		389	+ assert_tag :tag => 'div', :attributes => { :class => /article-body/ }, :content => /original article/
		390	+ end
		391	+
		392	+ should "display current article if version does not exist" do
		393	+ page = TextArticle.create!(:name => 'myarticle', :body => 'original article', :display_versions => true, :profile => profile)
		394	+ page.body = 'edited article'; page.save
		395	+
		396	+ get :view_page, :profile => profile.identifier, :page => [ 'myarticle' ], :version => 'bli'
		397	+
		398	+ assert_tag :tag => 'div', :attributes => { :class => /article-body/ }, :content => /edited article/
		399	+ end
		400	+
372	should 'not return an article of a different user' do	401	should 'not return an article of a different user' do
373	p1 = create_user('test_user').person	402	p1 = create_user('test_user').person
374	a = p1.articles.create!(:name => 'old-name')	403	a = p1.articles.create!(:name => 'old-name')