diff --git a/app/controllers/my_profile/cms_controller.rb b/app/controllers/my_profile/cms_controller.rb index 7164397..2b967f3 100644 --- a/app/controllers/my_profile/cms_controller.rb +++ b/app/controllers/my_profile/cms_controller.rb @@ -68,6 +68,9 @@ class CmsController < 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? diff --git a/app/models/article.rb b/app/models/article.rb index 72f1a09..ba71540 100644 --- a/app/models/article.rb +++ b/app/models/article.rb @@ -201,6 +201,7 @@ class Article < 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(' ') diff --git a/app/views/content_viewer/versioned_article.rhtml b/app/views/content_viewer/versioned_article.rhtml index b9a306a..6e626da 100644 --- a/app/views/content_viewer/versioned_article.rhtml +++ b/app/views/content_viewer/versioned_article.rhtml @@ -1,12 +1,13 @@
- <% 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, :article => @versioned_article.attributes }) %> - <%= expirable_button @page, :edit, content, url %> +
+ <% 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 %> +
<% end %> -
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 8754702..27f15fd 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -6548,3 +6548,9 @@ ul.article-versions li { font-size: 13px; } +#article ul.article-versions a.link-this-page { + text-decoration: none; + opacity: 0.5; + filter: alpha(opacity=50); + +} -- libgit2 0.21.2