New feature archive articles to avoid create comments, associate children articles and perform votes

Michel Felipe · Victor Costa · Victor Costa · Michel Felipe · Victor Costa · Victor Costa
1 parent d877a56d
Showing 19 changed files with 179 additions and 6 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/helpers/article_helper.rb
app/helpers/folder_helper.rb
app/models/article.rb
app/models/comment.rb
app/models/folder.rb
app/views/cms/_archived_warning.html.erb
app/views/cms/edit.html.erb
app/views/content_viewer/_article_toolbar.html.erb
app/views/content_viewer/view_page.html.erb
db/migrate/20151112135709_add_archived_to_articles.rb
public/images/icons-app/article-archived-icon.png
public/images/icons-app/article-private-icon.png
public/images/icons-app/article-public-icon.png
public/images/icons-app/warning-icon.png
public/javascripts/article.js
public/stylesheets/cms.scss
public/stylesheets/cms/access-options.scss
test/functional/cms_controller_test.rb
@@ -99,6 +99,7 @@ class CmsController &lt; MyProfileController
         @article.image.save!
       end
       @article.last_changed_by = user
+      @article.old_parent_id = @article.parent_id
       if @article.update_attributes(params[:article])
         if !continue
           if @article.content_type.nil? || @article.image?
@@ -15,6 +15,13 @@ module ArticleHelper
     topic_creation(@article) +
     content_tag('h4', _('Options')) +
     content_tag('div',
+      content_tag('div',
+        check_box(:article, :archived) +
+          content_tag('span', '&nbsp;', :class => 'access-archived-icon') +
+          content_tag('label', _('Read Only'), :for => 'article_archived_true') +
+          content_tag('span', _('Archive to avoid create comments, votes, actions in children articles...'), :class => 'access-note'),
+          :class => 'access-item'
+      ) +
       (article.profile.has_members? ?
       content_tag(
         'div',
@@ -63,13 +70,20 @@ module ArticleHelper
     content_tag('div',
       content_tag('div',
         radio_button(:article, :published, true) +
-          content_tag('label', _('Public (visible to other people)'), :for => 'article_published_true')
+          content_tag('span', '&nbsp;', :class => 'access-public-icon') +
+          content_tag('label', _('Public'), :for => 'article_published_true') +
+          content_tag('span', _('Visible to other people'), :class => 'access-note'),
+          :class => 'access-item'
            ) +
       content_tag('div',
         radio_button(:article, :published, false) +
-          content_tag('label', _('Private'), :for => 'article_published_false', :id => "label_private")
+          content_tag('span', '&nbsp;', :class => 'access-private-icon') +
+          content_tag('label', _('Private'), :for => 'article_published_false', :id => "label_private") +
+          content_tag('span', _('Limit visibility of this article'), :class => 'access-note'),
+          :class => 'access-item'
       ) +
-      privacity_exceptions(article, tokenized_children)
+      privacity_exceptions(article, tokenized_children),
+      :class => 'access-itens'
     )
   end
@@ -61,7 +61,15 @@ module FolderHelper
     @article = article
     visibility_options(article,tokenized_children) +
+    content_tag('h4', _('Options')) +
     content_tag('div',
+      content_tag('div',
+        check_box(:article, :archived) +
+          content_tag('span', '&nbsp;', :class => 'access-archived-icon') +
+          content_tag('label', _('Read Only'), :for => 'article_archived_true') +
+          content_tag('span', _('Archive to avoid votes and create new children articles'), :class => 'access-note'),
+          :class => 'access-item'
+      ) +
       hidden_field_tag('article[accept_comments]', 0)
     )
   end
@@ -9,7 +9,9 @@ class Article &lt; ActiveRecord::Base
                   :highlighted, :notify_comments, :display_hits, :slug,
                   :external_feed_builder, :display_versions, :external_link,
                   :image_builder, :show_to_followers,
-                  :author, :display_preview
+                  :author, :display_preview, :archived
+
+  attr_accessor :old_parent_id
   acts_as_having_image
@@ -154,6 +156,8 @@ class Article &lt; ActiveRecord::Base
   validate :no_self_reference
   validate :no_cyclical_reference, :if => 'parent_id.present?'
+  validate :parent_archived?
+
   def no_self_reference
     errors.add(:parent_id, _('self-reference is not allowed.')) if id && parent_id == id
   end
@@ -484,6 +488,10 @@ class Article &lt; ActiveRecord::Base
     end
   end
+  def archived?
+    (self.parent && self.parent.archived) || self.archived
+  end
+
   def self.folder_types
     ['Folder', 'Blog', 'Forum', 'Gallery']
   end
@@ -842,4 +850,10 @@ class Article &lt; ActiveRecord::Base
     sanitizer.sanitize(text)
   end
+  def parent_archived?
+     if (self.old_parent_id != self.parent_id) && self.parent && self.parent.archived?
+       errors.add(:parent_folder, N_('is archived!!'))
+     end
+  end
+
 end
@@ -210,4 +210,8 @@ class Comment &lt; ActiveRecord::Base
     user.present? && user == author
   end
+  def archived?
+    self.article.archived?
+  end
+
 end
@@ -65,4 +65,8 @@ class Folder &lt; Article
     !self.has_posts? || self.gallery?
   end
+  def archived?
+    self.archived
+  end
+
 end
@@ -0,0 +1,8 @@
+<% if !article.errors.any? %>
+  <div class="text-warning">
+    <p>
+      <i class="icon"></i>
+      <%= _("Archived article! It's read-only") %>
+    </p>
+  </div>
+<% end %>
 <%= error_messages_for 'article' %>
+<% if @article.archived? %>
+  <%= render :partial => 'archived_warning', :locals => {:article => @article} %>
+<% end %>
 <div class='<%= (@article.display_media_panel? ? 'with_media_panel' : 'no_media_panel') %>'>
 <%= labelled_form_for 'article', :html => { :multipart => true, :class => @type } do |f| %>
@@ -9,6 +12,7 @@
   <%= hidden_field_tag('success_back_to', @success_back_to) %>
+
   <%= render :partial => partial_for_class(@article.class), :locals => { :f => f } %>
   <% if environment.is_portal_community?(profile) %>
@@ -29,7 +29,9 @@
         <%= expirable_button @page, :locale, content, url %>
       <% end %>
-      <%= modal_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : @page.parent))) unless remove_content_button(:new, @page) %>
+      <% if !@page.archived? %>
+        <%= modal_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : @page.parent))) unless remove_content_button(:new, @page) %>
+      <% end %>
       <% content = content_tag('span', label_for_clone_article(@page)) %>
       <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'new', :id => @page.id, :clone => true,  :parent_id => (@page.folder? ? @page : @page.parent), :type => @page.class}) %>
@@ -64,6 +66,9 @@
     <% end %>
     <%= button_without_text(:feed, _('RSS feed'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
     <%= @plugins.dispatch(:article_header_extra_contents, @page).collect { |content| instance_exec(&content) }.join("") %>
+    <% if @page.archived? %>
+      <%= render :partial => 'cms/archived_warning', :locals => {:article => @page} %>
+    <% end %>
     <%= render :partial => 'article_title', :locals => {:no_link => true} %>
     <%= article_translations(@page) %>
   </div>
@@ -85,7 +85,7 @@
       <% end %>
     </ul>
-    <% if @page.accept_comments? %>
+    <% if !@page.archived? || @page.accept_comments? %>
       <div id='page-comment-form' class='page-comment-form'><%= render :partial => 'comment/comment_form', :locals =>{:url => {:controller => :comment, :action => :create}, :display_link => true, :cancel_triggers_hide => true}%></div>
     <% end %>
   </div><!-- end class="comments" -->
@@ -0,0 +1,9 @@
+class AddArchivedToArticles < ActiveRecord::Migration
+  def up
+    add_column :articles, :archived, :boolean, :default => false
+  end
+
+  def down
+    remove_column :articles, :archived
+  end
+end
@@ -212,4 +212,10 @@ jQuery(function($) {
   $("#article_published_true").click(show_hide_privacy_options);
   $(".custom_privacy_option").click(show_hide_token_input);
+  //Workaround to pointer-events:none CSS3  
+  $('a.disabled').click(function(e){
+    e.preventDefault();
+    return false;
+  });
+
 });
 @import 'cms/fetch-external-feed';
 @import 'cms/media-panel';
+@import 'cms/access-options';
 table.cms-articles {
   table-layout: fixed;
@@ -0,0 +1,67 @@
+//Variables
+$icons-size: 24px;
+$warning-color: #e75e40;
+$description-color: #666;
+$access-types: public, private, archived;
+
+.text-warning {
+  text-align: center;
+  color: $warning-color;
+  font: {
+    size: 15px;
+    weight: bold;
+  }
+
+  p i.icon {
+    display: inline-block;
+    font-size: inherit;
+    text-rendering: auto;
+    background: url('images/icons-app/warning-icon.png');
+    vertical-align: middle;
+    margin-top: -5px;
+    width: $icons-size;
+    height: $icons-size;
+    border: none;
+  }
+}
+
+#edit-article-options {
+
+  .access-itens .access-item {
+    input,label {
+      cursor: pointer;
+    }
+  }
+
+  .access-item {
+    margin: 15px 0;
+    label {
+      font: {
+        size: 13px;
+        weight: bold;
+      }
+    }
+  }
+
+  @each $access_type in $access-types {
+    .access-#{$access_type}-icon, .access-#{$access_type}-icon {
+      display: inline-block;
+      margin-right: 5px;
+      width: $icons-size;
+      height: $icons-size;
+      vertical-align: middle;
+      background-image: url('images/icons-app/article-#{$access_type}-icon.png');
+    }
+  }
+
+  .access-note {
+    display: block;
+    margin: 0;
+    color: $description-color;
+    margin-left: 50px;
+    font: {
+      size: 12px;
+      weight: normal;
+    }
+  }
+}
@@ -697,6 +697,34 @@ class CmsControllerTest &lt; ActionController::TestCase
     end
   end
+  should "marks a article like archived" do
+    article = create(Article, :profile => profile, :name => 'test', :published => true, :archived => false)
+
+    post :edit, :profile => profile.identifier, :id => article.id, :article => {:archived => true}
+    get :edit, :profile => profile.identifier, :id => article.id
+    assert_tag :tag => 'input', :attributes => { :type => 'checkbox', :name => 'article[archived]', :id => 'article_archived', :checked => 'checked' }
+
+  end
+
+  should "try add children into archived folders" do
+    folder = create(Folder, :profile => profile, :name => 'test', :published => true, :archived => false)
+    article_child = create(Article, :profile => profile, :name => 'test child', :parent_id => folder.id, :published => true, :archived => false)
+
+    get :edit, :profile => profile.identifier, :id => folder.id
+    assert_tag :tag => 'input', :attributes => { :type => 'checkbox', :name => 'article[archived]', :id => 'article_archived' }
+
+    post :edit, :profile => profile.identifier, :id => folder.id, :article => {:archived => true}
+
+    get :edit, :profile => profile.identifier, :id => article_child.id
+    assert_tag :tag => 'div', :attributes => { :class => 'text-warning'}
+
+    err = assert_raises ActiveRecord::RecordInvalid do
+      another_article_child = create(Article, :profile => profile, :name => 'other test child', :parent_id => folder.id, :published => true, :archived => false)
+    end
+    assert_match 'Parent folder is archived', err.message
+
+  end
+
   should 'be able to add image with alignment' do
     post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :article => { :name => 'image-alignment', :body => "the text of the article with image <img src='#' align='right'/> right align..." }
     saved = TinyMceArticle.find_by_name('image-alignment')
	@@ -61,7 +61,15 @@ module FolderHelper		@@ -61,7 +61,15 @@ module FolderHelper
61	@article = article	61	@article = article
62		62
63	visibility_options(article,tokenized_children) +	63	visibility_options(article,tokenized_children) +
		64	+ content_tag('h4', _('Options')) +
64	content_tag('div',	65	content_tag('div',
		66	+ content_tag('div',
		67	+ check_box(:article, :archived) +
		68	+ content_tag('span', ' ', :class => 'access-archived-icon') +
		69	+ content_tag('label', _('Read Only'), :for => 'article_archived_true') +
		70	+ content_tag('span', _('Archive to avoid votes and create new children articles'), :class => 'access-note'),
		71	+ :class => 'access-item'
		72	+ ) +
65	hidden_field_tag('article[accept_comments]', 0)	73	hidden_field_tag('article[accept_comments]', 0)
66	)	74	)
67	end	75	end
	@@ -210,4 +210,8 @@ class Comment < ActiveRecord::Base		@@ -210,4 +210,8 @@ class Comment < ActiveRecord::Base
210	user.present? && user == author	210	user.present? && user == author
211	end	211	end
212		212
		213	+ def archived?
		214	+ self.article.archived?
		215	+ end
		216	+
213	end	217	end
	@@ -65,4 +65,8 @@ class Folder < Article		@@ -65,4 +65,8 @@ class Folder < Article
65	!self.has_posts? \|\| self.gallery?	65	!self.has_posts? \|\| self.gallery?
66	end	66	end
67		67
		68	+ def archived?
		69	+ self.archived
		70	+ end
		71	+
68	end	72	end
@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
	1	+<% if !article.errors.any? %>
	2	+ <div class="text-warning">
	3	+ <p>
	4	+ <i class="icon"></i>
	5	+ <%= _("Archived article! It's read-only") %>
	6	+ </p>
	7	+ </div>
	8	+<% end %>
	@@ -85,7 +85,7 @@		@@ -85,7 +85,7 @@
85	<% end %>	85	<% end %>
86	</ul>	86	</ul>
87		87
88	- <% if @page.accept_comments? %>	88	+ <% if !@page.archived? \|\| @page.accept_comments? %>
89	<div id='page-comment-form' class='page-comment-form'><%= render :partial => 'comment/comment_form', :locals =>{:url => {:controller => :comment, :action => :create}, :display_link => true, :cancel_triggers_hide => true}%></div>	89	<div id='page-comment-form' class='page-comment-form'><%= render :partial => 'comment/comment_form', :locals =>{:url => {:controller => :comment, :action => :create}, :display_link => true, :cancel_triggers_hide => true}%></div>
90	<% end %>	90	<% end %>
91	</div><!-- end class="comments" -->	91	</div><!-- end class="comments" -->
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+class AddArchivedToArticles < ActiveRecord::Migration
	2	+ def up
	3	+ add_column :articles, :archived, :boolean, :default => false
	4	+ end
	5	+
	6	+ def down
	7	+ remove_column :articles, :archived
	8	+ end
	9	+end
	@@ -212,4 +212,10 @@ jQuery(function($) {		@@ -212,4 +212,10 @@ jQuery(function($) {
212	$("#article_published_true").click(show_hide_privacy_options);	212	$("#article_published_true").click(show_hide_privacy_options);
213	$(".custom_privacy_option").click(show_hide_token_input);	213	$(".custom_privacy_option").click(show_hide_token_input);
214		214
		215	+ //Workaround to pointer-events:none CSS3
		216	+ $('a.disabled').click(function(e){
		217	+ e.preventDefault();
		218	+ return false;
		219	+ });
		220	+
215	});	221	});
1	@import 'cms/fetch-external-feed';	1	@import 'cms/fetch-external-feed';
2	@import 'cms/media-panel';	2	@import 'cms/media-panel';
		3	+@import 'cms/access-options';
3		4
4	table.cms-articles {	5	table.cms-articles {
5	table-layout: fixed;	6	table-layout: fixed;
@@ -0,0 +1,67 @@		@@ -0,0 +1,67 @@
	1	+//Variables
	2	+$icons-size: 24px;
	3	+$warning-color: #e75e40;
	4	+$description-color: #666;
	5	+$access-types: public, private, archived;
	6	+
	7	+.text-warning {
	8	+ text-align: center;
	9	+ color: $warning-color;
	10	+ font: {
	11	+ size: 15px;
	12	+ weight: bold;
	13	+ }
	14	+
	15	+ p i.icon {
	16	+ display: inline-block;
	17	+ font-size: inherit;
	18	+ text-rendering: auto;
	19	+ background: url('images/icons-app/warning-icon.png');
	20	+ vertical-align: middle;
	21	+ margin-top: -5px;
	22	+ width: $icons-size;
	23	+ height: $icons-size;
	24	+ border: none;
	25	+ }
	26	+}
	27	+
	28	+#edit-article-options {
	29	+
	30	+ .access-itens .access-item {
	31	+ input,label {
	32	+ cursor: pointer;
	33	+ }
	34	+ }
	35	+
	36	+ .access-item {
	37	+ margin: 15px 0;
	38	+ label {
	39	+ font: {
	40	+ size: 13px;
	41	+ weight: bold;
	42	+ }
	43	+ }
	44	+ }
	45	+
	46	+ @each $access_type in $access-types {
	47	+ .access-#{$access_type}-icon, .access-#{$access_type}-icon {
	48	+ display: inline-block;
	49	+ margin-right: 5px;
	50	+ width: $icons-size;
	51	+ height: $icons-size;
	52	+ vertical-align: middle;
	53	+ background-image: url('images/icons-app/article-#{$access_type}-icon.png');
	54	+ }
	55	+ }
	56	+
	57	+ .access-note {
	58	+ display: block;
	59	+ margin: 0;
	60	+ color: $description-color;
	61	+ margin-left: 50px;
	62	+ font: {
	63	+ size: 12px;
	64	+ weight: normal;
	65	+ }
	66	+ }
	67	+}
	@@ -697,6 +697,34 @@ class CmsControllerTest < ActionController::TestCase		@@ -697,6 +697,34 @@ class CmsControllerTest < ActionController::TestCase
697	end	697	end
698	end	698	end
699		699
		700	+ should "marks a article like archived" do
		701	+ article = create(Article, :profile => profile, :name => 'test', :published => true, :archived => false)
		702	+
		703	+ post :edit, :profile => profile.identifier, :id => article.id, :article => {:archived => true}
		704	+ get :edit, :profile => profile.identifier, :id => article.id
		705	+ assert_tag :tag => 'input', :attributes => { :type => 'checkbox', :name => 'article[archived]', :id => 'article_archived', :checked => 'checked' }
		706	+
		707	+ end
		708	+
		709	+ should "try add children into archived folders" do
		710	+ folder = create(Folder, :profile => profile, :name => 'test', :published => true, :archived => false)
		711	+ article_child = create(Article, :profile => profile, :name => 'test child', :parent_id => folder.id, :published => true, :archived => false)
		712	+
		713	+ get :edit, :profile => profile.identifier, :id => folder.id
		714	+ assert_tag :tag => 'input', :attributes => { :type => 'checkbox', :name => 'article[archived]', :id => 'article_archived' }
		715	+
		716	+ post :edit, :profile => profile.identifier, :id => folder.id, :article => {:archived => true}
		717	+
		718	+ get :edit, :profile => profile.identifier, :id => article_child.id
		719	+ assert_tag :tag => 'div', :attributes => { :class => 'text-warning'}
		720	+
		721	+ err = assert_raises ActiveRecord::RecordInvalid do
		722	+ another_article_child = create(Article, :profile => profile, :name => 'other test child', :parent_id => folder.id, :published => true, :archived => false)
		723	+ end
		724	+ assert_match 'Parent folder is archived', err.message
		725	+
		726	+ end
		727	+
700	should 'be able to add image with alignment' do	728	should 'be able to add image with alignment' do
701	post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :article => { :name => 'image-alignment', :body => "the text of the article with image <img src='#' align='right'/> right align..." }	729	post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :article => { :name => 'image-alignment', :body => "the text of the article with image <img src='#' align='right'/> right align..." }
702	saved = TinyMceArticle.find_by_name('image-alignment')	730	saved = TinyMceArticle.find_by_name('image-alignment')