Merge branch 'staging' into staging_rails4

Conflicts: app/helpers/forms_helper.rb app/views/cms/edit.html.erb lib/noosfero/api/entities.rb lib/noosfero/api/v1/comments.rb lib/noosfero/api/v1/search.rb test/unit/api/search_test.rb

Merge branch 'staging' into staging_rails4
Conflicts: app/helpers/forms_helper.rb app/views/cms/edit.html.erb lib/noosfero/api/entities.rb lib/noosfero/api/v1/comments.rb lib/noosfero/api/v1/search.rb test/unit/api/search_test.rb
Victor Costa
2 parents 8f8f1ad6 7e2363ea
Showing 44 changed files with 445 additions and 39 deletions Show diff stats
app/helpers/article_helper.rb
app/helpers/folder_helper.rb
app/models/article.rb
app/models/comment.rb
app/models/folder.rb
app/models/user.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/_publishing_info.html.erb
app/views/content_viewer/view_page.html.erb
db/migrate/20151112135709_add_archived_to_articles.rb
lib/noosfero/api/entities.rb
lib/noosfero/api/session.rb
lib/noosfero/api/v1/articles.rb
lib/noosfero/api/v1/comments.rb
lib/noosfero/api/v1/search.rb
lib/noosfero/vote_ext.rb
plugins/dialoga
plugins/gamification
@@ -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
  
@@ -59,7 +59,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,7 @@ class Article &lt; ActiveRecord::Base
                   :highlighted, :notify_comments, :display_hits, :slug,
                   :external_feed_builder, :display_versions, :external_link,
                   :author, :published_at, :person_followers, :show_to_followers, 
-                  :image_builder, :display_preview
+                  :image_builder, :display_preview, :archived
  
   acts_as_having_image
  
@@ -156,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
@@ -490,6 +492,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
@@ -636,13 +642,21 @@ class Article &lt; ActiveRecord::Base
   end
  
   def hit
-    self.class.connection.execute('update articles set hits = hits + 1 where id = %d' % self.id.to_i)
-    self.hits += 1
+    if !archived?
+      self.class.connection.execute('update articles set hits = hits + 1 where id = %d' % self.id.to_i)
+      self.hits += 1
+    end
   end
  
   def self.hit(articles)
-    Article.where(:id => articles.map(&:id)).update_all('hits = hits + 1')
-    articles.each { |a| a.hits += 1 }
+    ids = []
+    articles.each do |article|
+      if !article.archived?
+        ids << article.id
+        article.hits += 1
+      end
+    end
+    Article.where(:id => ids).update_all('hits = hits + 1') if !ids.empty?
   end
  
   def can_display_hits?
@@ -856,4 +870,10 @@ class Article &lt; ActiveRecord::Base
     sanitizer.sanitize(text)
   end
  
+  def parent_archived?
+     if self.parent_id_changed? && self.parent && self.parent.archived?
+       errors.add(:parent_folder, N_('is archived!!'))
+     end
+  end
+
 end
@@ -34,7 +34,9 @@ class Comment &lt; ActiveRecord::Base
       rec.errors.add(:name, _('{fn} can only be informed for unauthenticated authors').fix_i18n)
     end
   end
-  
+
+  validate :article_archived?
+
   acts_as_having_settings
  
   xss_terminate :only => [ :body, :title, :name ], :on => 'validation'
@@ -210,4 +212,14 @@ class Comment &lt; ActiveRecord::Base
     user.present? && user == author
   end
  
+  def archived?
+    self.article.archived? if self.article.present? && self.article.respond_to?(:archived?)
+  end
+
+  protected
+
+  def article_archived?
+    errors.add(:article, N_('associated with this comment is achived!')) if archived?
+  end
+
 end
@@ -66,4 +66,8 @@ class Folder &lt; Article
     !self.has_posts? || self.gallery?
   end
  
+  def archived?
+    self.archived
+  end
+
 end
@@ -424,6 +424,12 @@ class User &lt; ActiveRecord::Base
     @is_password_required = false
   end
  
+  def resend_activation_code
+    return if self.activated?
+    update_attribute(:activation_code, make_activation_code)
+    self.deliver_activation_code
+  end
+
   protected
  
     def normalize_email
@@ -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| %>
  
@@ -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>
@@ -16,7 +16,7 @@
   <div id='article-sub-header'>
     <% if @page.display_hits? %>
       <div id="article-hits">
-        <%= n_('Viewed one time', 'Viewed %{num} times', @page.hits) % { :num => @page.hits } %>
+        <%= n_('Viewed one time %{desc}', 'Viewed %{num} times %{desc}', @page.hits) % { :num => @page.hits, :desc => @page.archived? ? '<b>'+_('(Not countable anymore)')+'</b>' : '' } %>
       </div>
     <% end %>
  
@@ -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
@@ -205,7 +205,7 @@ module Noosfero
  
       class UserLogin < User
         root 'users', 'user'
-        expose :private_token, documentation: {type: 'String', desc: 'A valid authentication code for post/delete api actions'}
+        expose :private_token, documentation: {type: 'String', desc: 'A valid authentication code for post/delete api actions'}, if: lambda {|object, options| object.activated? }
       end
  
       class Task < Entity
@@ -130,6 +130,25 @@ module Noosfero
         end
       end
  
+      # Resend activation code.
+      #
+      # Parameters:
+      #   value (required)                  - Email or login
+      # Example Request:
+      #   POST /resend_activation_code?value=some@mail.com
+      post "/resend_activation_code" do
+        requestors = fetch_requestors(params[:value])
+        not_found! if requestors.blank?
+        remote_ip = (request.respond_to?(:remote_ip) && request.remote_ip) || (env && env['REMOTE_ADDR'])
+        # test_captcha will render_api_error! and exit in case of any problem
+        # this return is just to improve the clarity of the execution path
+        return unless test_captcha(remote_ip, params, environment)
+        requestors.each do |requestor|
+          requestor.user.resend_activation_code
+        end
+        present requestors.map(&:user), :with => Entities::UserLogin
+      end
+
       params do
         requires :code, type: String, desc: _("Forgot password code")
       end
@@ -131,9 +131,8 @@ module Noosfero
             failure [[403, 'Forbidden']]
             named 'ArticleFollowers'
           end
-
-           #FIXME refactor this method
           get 'voted_by_me' do
+            #FIXME refactor this method
             present_articles_paginated(current_person.votes.where(:voteable_type => 'Article').collect(&:voteable))
           end
  
@@ -150,8 +149,14 @@ module Noosfero
             # FIXME verify allowed values
             render_api_error!('Vote value not allowed', 400) unless [-1, 1].include?(value)
             article = find_article(environment.articles, params[:id])
-            vote = Vote.new(:voteable => article, :voter => current_person, :vote => value)
-            {:vote => vote.save}
+
+            begin
+              vote = Vote.new(:voteable => article, :voter => current_person, :vote => value)
+              saved = vote.save!
+              {:vote => saved}
+            rescue ActiveRecord::RecordInvalid => e
+              render_api_error!(e.message, 400)
+            end
           end
  
           desc 'Return the children of a article identified by id' do
@@ -31,7 +31,13 @@ module Noosfero
           post ":id/comments" do
             article = find_article(environment.articles, params[:id])
             options = params.select { |key,v| !['id','private_token'].include?(key) }.merge(:author => current_person, :source => article)
-            present Comment.create(options), :with => Entities::Comment, :current_person => current_person
+            begin
+              comment = Comment.create(options)
+              comment.save!
+            rescue ActiveRecord::RecordInvalid => e
+              render_api_error!(e.message, 400)
+            end
+            present comment, :with => Entities::Comment, :current_person => current_person
           end
         end
  
@@ -5,6 +5,7 @@ module Noosfero
  
         resource :search do
           resource :article do
+            paginate per_page: 20, max_per_page: 200
             get do
               # Security checks
               sanitize_params_hash(params)
@@ -13,24 +14,25 @@ module Noosfero
               context = environment
  
               profile = environment.profiles.find(params[:profile_id]) if params[:profile_id]
-              scope = profile.nil? ? environment.articles.is_public : profile.articles.is_public
+
+              scope = profile.nil? ? environment.articles.public : profile.articles.public
+
               scope = scope.where(:type => params[:type]) if params[:type] && !(params[:type] == 'Article')
+
               scope = scope.where(:parent_id => params[:parent_id]) if params[:parent_id].present?
+
               scope = scope.joins(:categories).where(:categories => {:id => params[:category_ids]}) if params[:category_ids].present?
+
               query = params[:query] || ""
               order = "more_recent"
  
               options = {:filter => order, :template_id => params[:template_id]}
  
-              paginate_options = params.select{|k,v| [:page, :per_page].include?(k.to_sym)}.symbolize_keys
-              paginate_options.each_pair{|k,v| v=v.to_i}
-              paginate_options[:page]=1 if !paginate_options.keys.include?(:page)
-
               search_result = find_by_contents(asset, context, scope, query, paginate_options, options)
  
               articles = search_result[:results]
  
-              result = present_articles(articles)
+              result = present_articles_paginated(articles)
  
               result
             end
@@ -8,4 +8,15 @@ class Vote
     voter.present?
   end
  
+  validate :verify_target_archived
+
+  def verify_target_archived
+    if voteable.kind_of?(Article) || voteable.kind_of?(Comment)
+      if voteable.archived?
+        errors.add(:base, _("The target is achived and can't accept votes"))
+        false
+      end
+    end
+  end
+
 end
-Subproject commit b963a3fc7fb7df7853c97d5763dd2e11e35072e1
+Subproject commit d654ce48f466687dd01ae023b68122b0aaba7d3f
-Subproject commit 4d4afd7e7e60343336c20813dce47f327f8a729f
+Subproject commit bea83c2384fd561acb4cddf17454616dd91fabd7
@@ -4,7 +4,9 @@ class ActiveRecord::Base
   def self.pg_search_plugin_search(query)
     filtered_query = query.gsub(/[\|\(\)\\\/\s\[\]'"*%&!:]/,' ').split.map{|w| w += ":*"}.join('|')
     if defined?(self::SEARCHABLE_FIELDS)
-      where("to_tsvector('simple', #{pg_search_plugin_fields}) @@ to_tsquery('#{filtered_query}')")
+      select("*,ts_rank(to_tsvector('simple', #{pg_search_plugin_fields}), to_tsquery('#{filtered_query}')) as rank").
+        where("to_tsvector('simple', #{pg_search_plugin_fields}) @@ to_tsquery('#{filtered_query}')").
+        order("rank DESC")
     else
       raise "No searchable fields defined for #{self.name}"
     end
@@ -21,6 +21,13 @@ class PgSearchPluginTest &lt; ActiveSupport::TestCase
     assert_includes search(Profile, 'admin deb'), profile2
   end
  
+  should 'rank profiles based on the search entry' do
+    profile1 = fast_create(Profile, :identifier => 'profile1', :name => 'debugger')
+    profile2 = fast_create(Profile, :identifier => 'profile2', :name => 'profile admin debugger')
+    profile3 = fast_create(Profile, :identifier => 'profile3', :name => 'admin debugger')
+    assert_equal [profile2, profile3, profile1], search(Profile, 'profile admin deb')
+  end
+
   should 'locate profile escaping special characters' do
     profile = fast_create(Profile, :name => 'John', :identifier => 'waterfall')
     assert_includes search(Profile, ') ( /\/\/\/\/\ o_o oOo o_o /\/\/\/\/\ ) ((tx waterfall)'), profile
@@ -2,8 +2,10 @@ module VotePluginHelper
  
   def vote_partial(target, like = true, load_voters=false)
     vote = like ? 1 : -1
+
     like_action = like ? 'like' : 'dislike'
     type = target.kind_of?(Article) ? 'article' : target.kind_of?(Comment) ? 'comment' : nil
+    disable_vote = target.archived? ? true : false
  
     proc do
       settings = Noosfero::Plugin::Settings.new(environment, VotePlugin)
@@ -14,7 +16,7 @@ module VotePluginHelper
         active = user ? (like ? user.voted_for?(target) : user.voted_against?(target)) : false
         count = like ? target.votes_for : target.votes_against
  
-        render(:partial => 'vote/vote', :locals => {:target => target, :active => active, :action => like_action, :count => count, :voters => voters, :vote => vote, :model => type })
+        render(:partial => 'vote/vote', :locals => {:target => target, :active => active, :action => like_action, :count => count, :voters => voters, :vote => vote, :model => type, :disable_vote => disable_vote })
       else
         ""
       end
@@ -73,3 +73,12 @@
 #article .action .vote-detail img {
   vertical-align: bottom;
 }
+
+.comments-action-bar span.disabled a,
+.comments-action-bar span.disabled a:hover,
+.vote-actions span.disabled a,
+.vote-actions span.disabled a:hover {
+  opacity: 0.5;
+  pointer-events: none;
+  cursor: default;
+}
@@ -16,7 +16,9 @@ function openVotersDialog(div) {
   clearTimeout(openEvent);
   var url = $(div).data('reload_url');
   hideAllVoteDetail();
-  $.post(url);
+  if(url && url != '#'){
+    $.post(url);
+  }
 }
  
 jQuery('body').live('click', function() { hideAllVoteDetail(); });
@@ -32,6 +32,18 @@ class VotePluginProfileControllerTest &lt; ActionController::TestCase
     assert profile.votes.empty?
   end
  
+  should 'not vote if a target is archived' do
+    article = Article.create!(:profile => profile, :name => 'Archived article', :archived => false)
+    comment = Comment.create!(:body => 'Comment test', :source => article, :author => profile)
+    xhr :post, :vote, :profile => profile.identifier, :id => article.id, :model => 'article', :vote => 1
+    assert !profile.votes.empty?
+
+    article.update_attributes(:archived => true)
+    xhr :post, :vote, :profile => profile.identifier, :id => comment.id, :model => 'comment', :vote => 1
+
+    assert !profile.voted_for?(comment)
+  end
+
   should 'like comment' do
     xhr :post, :vote, :profile => profile.identifier, :id => comment.id, :model => 'comment', :vote => 1
     assert profile.voted_for?(comment)
 <%
-url = url_for(:controller => 'vote_plugin_profile', :profile => profile.identifier, :action => :vote, :id => target.id, :model => model, :vote => vote)
-reload_url = url_for(:controller => 'vote_plugin_profile', :profile => profile.identifier, :action => :reload_vote, :id => target.id, :model => model, :vote => vote)
+if disable_vote
+  url = reload_url = '#'
+  class_action = 'disabled'
+else
+  url = url_for(:controller => 'vote_plugin_profile', :profile => profile.identifier, :action => :vote, :id => target.id, :model => model, :vote => vote)
+  reload_url = url_for(:controller => 'vote_plugin_profile', :profile => profile.identifier, :action => :reload_vote, :id => target.id, :model => model, :vote => vote)
+end
 %>
  
-<span id="vote_<%= model %>_<%= target.id %>_<%= vote %>" data-reload_url=<%= reload_url %> class="vote-action action <%= action %>-action">
+<span id="vote_<%= model %>_<%= target.id %>_<%= vote %>" data-reload_url=<%= reload_url %> class="vote-action action <%= action %>-action <%= class_action %>">
  
   <%= link_to content_tag(:span, count, :class=>'like-action-counter') + content_tag(:span, '', :class=>"action-icon #{action}"), url, :class => "#{active ? 'like-action-active':''} #{user ? '':'disabled'} require-login-popup" %>
  
@@ -5073,6 +5073,10 @@ msgid_plural &quot;Viewed %{num} times&quot;
 msgstr[0] ""
 msgstr[1] ""
  
+#: app/views/content_viewer/_publishing_info.html.erb:19
+msgid "(Not countable anymore)"
+msgstr ""
+
 #: app/views/content_viewer/versions_diff.html.erb:5
 msgid "Changes on \"%s\""
 msgstr ""
@@ -5231,11 +5231,15 @@ msgid &quot;Reply&quot;
 msgstr "Responder"
  
 #: app/views/content_viewer/_publishing_info.html.erb:19
-msgid "Viewed one time"
-msgid_plural "Viewed %{num} times"
+msgid "Viewed one time %{desc}"
+msgid_plural "Viewed %{num} times %{desc}"
 msgstr[0] "Visualizado uma vez"
 msgstr[1] "Visualizado %{num} vezes"
  
+#: app/views/content_viewer/_publishing_info.html.erb:19
+msgid "(Not countable anymore)"
+msgstr "(Não mais contabilizado)"
+
 #: app/views/content_viewer/versions_diff.html.erb:5
 msgid "Changes on \"%s\""
 msgstr "Mudanças em \"%s\""
@@ -200,4 +200,10 @@ jQuery(function($) {
  
   $(".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;
+    }
+  }
+}
@@ -694,6 +694,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')
@@ -138,6 +138,16 @@ class ArticlesTest &lt; ActiveSupport::TestCase
     assert_equal true, json['vote']
   end
  
+  should 'not perform a vote in a archived article' do
+    article = fast_create(Article, :profile_id => @person.id, :name => "Some thing", :archived => true)
+    @params[:value] = 1
+
+    post "/api/v1/articles/#{article.id}/vote?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+
+    assert_equal 400, last_response.status
+  end
+
   expose_attributes = %w(id body abstract created_at title author profile categories image votes_for votes_against setting position hits start_date end_date tag_list parent children children_count)
  
   expose_attributes.each do |attr|
@@ -520,6 +530,14 @@ class ArticlesTest &lt; ActiveSupport::TestCase
     assert_equal 1, json['article']['hits']
   end
  
+  should 'not update hit attribute of a specific child if a article is archived' do
+    folder = fast_create(Folder, :profile_id => user.person.id, :archived => true)
+    article = fast_create(Article, :parent_id => folder.id, :profile_id => user.person.id)
+    get "/api/v1/articles/#{folder.id}/children/#{article.id}?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal 0, json['article']['hits']
+  end
+
   should 'list all events of a community in a given category' do
     co = Community.create(identifier: 'my-community', name: 'name-my-community')
     c1 = Category.create(environment: Environment.default, name: 'my-category')
@@ -66,6 +66,15 @@ class CommentsTest &lt; ActiveSupport::TestCase
     assert_equal body, json['comment']['body']
   end
  
+  should 'not comment an archived article' do
+    article = fast_create(Article, :profile_id => user.person.id, :name => "Some thing", :archived => true)
+    body = 'My comment'
+    params.merge!({:body => body})
+
+    post "/api/v1/articles/#{article.id}/comments?#{params.to_query}"
+    assert_equal 400, last_response.status
+  end
+
   should 'comment creation define the source' do
     amount = Comment.count
     article = fast_create(Article, :profile_id => user.person.id, :name => "Some thing")
@@ -30,8 +30,7 @@ class SearchTest &lt; ActiveSupport::TestCase
     assert_empty json['articles']
   end
  
-  should 'not list articles of wrong type' do
-    Article.delete_all
+  should 'do not list articles of wrong type' do
     fast_create(Article, :profile_id => person.id)
     get "/api/v1/search/article?type=TinyMceArticle"
     json = JSON.parse(last_response.body)
@@ -131,10 +130,8 @@ class SearchTest &lt; ActiveSupport::TestCase
     article2.categories<< category2
     get "/api/v1/search/article?category_ids[]=#{category1.id}&category_ids[]=#{category2.id}"
     json = JSON.parse(last_response.body)
-    ids = [article1.id, article2.id]
     assert_equal 2, json['articles'].count
-    assert_includes ids, json['articles'].first["id"]
-    assert_includes ids, json['articles'].last["id"]
+    assert_equivalent [article1.id, article2.id], json['articles'].map{|a| a['id']}
   end
  
 end
@@ -198,4 +198,40 @@ class SessionTest &lt; ActiveSupport::TestCase
     assert_equal 404, last_response.status
   end
  
+  should 'not return private token when the registered user is inactive' do
+    params = {:login => "newuserapi", :password => "newuserapi", :password_confirmation => "newuserapi", :email => "newuserapi@email.com" }
+    post "/api/v1/register?#{params.to_query}"
+    assert_equal 201, last_response.status
+    json = JSON.parse(last_response.body)
+    assert !User['newuserapi'].activated?
+    assert !json['user']['activated']
+    assert !json['user']['private_token'].present?
+  end
+
+  should 'resend activation code for an inactive user' do
+    user = create_user
+    params = {:value => user.login}
+    Delayed::Job.destroy_all
+    assert_difference 'ActionMailer::Base.deliveries.size' do
+      post "/api/v1/resend_activation_code?#{params.to_query}"
+      process_delayed_job_queue
+    end
+    json = JSON.parse(last_response.body)
+    assert !json['users'].first['activated']
+    assert_equal user.email, ActionMailer::Base.deliveries.last['to'].to_s
+  end
+
+  should 'not resend activation code for an active user' do
+    user = create_user
+    params = {:value => user.login}
+    user.activate
+    Delayed::Job.destroy_all
+    assert_no_difference 'ActionMailer::Base.deliveries.size' do
+      post "/api/v1/resend_activation_code?#{params.to_query}"
+      process_delayed_job_queue
+    end
+    json = JSON.parse(last_response.body)
+    assert json['users'].first['activated']
+  end
+
 end
@@ -2179,10 +2179,21 @@ class ArticleTest &lt; ActiveSupport::TestCase
     a3 = fast_create(Article)
     Article.hit([a1, a2, a3])
     Article.hit([a2, a3])
+
     assert_equal [1, 2, 2], [a1.hits, a2.hits, a3.hits]
     assert_equal [1, 2, 2], [a1.reload.hits, a2.reload.hits, a3.reload.hits]
   end
  
+  should 'not update hit attribute of archiveds articles' do
+    a1 = fast_create(Article)
+    a2 = fast_create(Article, :archived => true)
+    a3 = fast_create(Article, :archived => true)
+    Article.hit([a1, a2, a3])
+
+    assert_equal [1, 0, 0], [a1.hits, a2.hits, a3.hits]
+    assert_equal [1, 0, 0], [a1.reload.hits, a2.reload.hits, a3.reload.hits]
+  end
+
   should 'vote in a article' do
     article = create(Article, :name => 'Test', :profile => profile, :last_changed_by => nil)
     profile.vote(article, 5)
@@ -2241,4 +2252,25 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert !a.display_preview?
   end
  
+  should 'check if a article is archived' do
+    folder = Folder.create!(:name => 'Parent Archived', :profile => profile)
+    a1 = Article.create!(:name => 'Test', :profile => profile, :parent_id => folder.id, :archived => false)
+    a2 = Article.create!(:name => 'Test 2', :profile => profile, :archived => true)
+    folder.update_attributes(:archived => true)
+    a1.reload
+
+    assert a1.archived?
+    assert a2.archived?
+  end
+
+  should 'try add a child article to a archived folder' do
+    folder = Folder.create!(:name => 'Parent Archived', :profile => profile, :archived => true)
+
+    err = assert_raises ActiveRecord::RecordInvalid do
+      a1 = Article.create!(:name => 'Test', :profile => profile, :parent_id => folder.id, :archived => false)
+    end
+
+    assert_match 'Parent folder is archived', err.message
+  end
+
 end
@@ -95,6 +95,17 @@ class CommentTest &lt; ActiveSupport::TestCase
     assert_equal cc + 1, ActionTracker::Record.find(activity.id).comments_count
   end
  
+  should 'try add a comment to a archived article' do
+    person = fast_create(Person)
+    article = Article.create!(:name => 'Test', :profile => person, :archived => true)
+
+    err = assert_raises ActiveRecord::RecordInvalid do
+      comment = create(Comment, :source => article, :author_id => person.id)
+    end
+
+    assert_match 'Article associated with this comment is achived', err.message
+  end
+
   should 'provide author name for authenticated authors' do
     owner = create_user('testuser').person
     assert_equal 'testuser', build(Comment, :author => owner).author_name
@@ -756,6 +756,28 @@ class UserTest &lt; ActiveSupport::TestCase
     assert_equal 'quire', user.person.name
   end
  
+  should 'deliver e-mail with activation code when resend was requested and user was not activated' do
+    user = new_user :email => 'pending@activation.com'
+    activation_code = user.activation_code
+    Delayed::Job.destroy_all
+    assert_difference 'ActionMailer::Base.deliveries.size', 1 do
+      user.resend_activation_code
+      process_delayed_job_queue
+    end
+    assert_not_equal activation_code, user.reload.activation_code
+    assert_equal 'pending@activation.com', ActionMailer::Base.deliveries.last['to'].to_s
+  end
+
+  should 'not deliver e-mail with activation code when resend was requested and user was activated' do
+    user = new_user :email => 'pending@activation.com'
+    user.activate
+    Delayed::Job.destroy_all
+    assert_no_difference 'ActionMailer::Base.deliveries.size' do
+      user.resend_activation_code
+      process_delayed_job_queue
+    end
+  end
+
   protected
     def new_user(options = {})
       user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))
...	...	@@ -15,6 +15,13 @@ module ArticleHelper
15	15	topic_creation(@article) +
16	16	content_tag('h4', _('Options')) +
17	17	content_tag('div',
	18	+ content_tag('div',
	19	+ check_box(:article, :archived) +
	20	+ content_tag('span', ' ', :class => 'access-archived-icon') +
	21	+ content_tag('label', _('Read Only'), :for => 'article_archived_true') +
	22	+ content_tag('span', _('Archive to avoid create comments, votes, actions in children articles...'), :class => 'access-note'),
	23	+ :class => 'access-item'
	24	+ ) +
18	25	(article.profile.has_members? ?
19	26	content_tag(
20	27	'div',
...	...	@@ -63,13 +70,20 @@ module ArticleHelper
63	70	content_tag('div',
64	71	content_tag('div',
65	72	radio_button(:article, :published, true) +
66		- content_tag('label', _('Public (visible to other people)'), :for => 'article_published_true')
	73	+ content_tag('span', ' ', :class => 'access-public-icon') +
	74	+ content_tag('label', _('Public'), :for => 'article_published_true') +
	75	+ content_tag('span', _('Visible to other people'), :class => 'access-note'),
	76	+ :class => 'access-item'
67	77	) +
68	78	content_tag('div',
69	79	radio_button(:article, :published, false) +
70		- content_tag('label', _('Private'), :for => 'article_published_false', :id => "label_private")
	80	+ content_tag('span', ' ', :class => 'access-private-icon') +
	81	+ content_tag('label', _('Private'), :for => 'article_published_false', :id => "label_private") +
	82	+ content_tag('span', _('Limit visibility of this article'), :class => 'access-note'),
	83	+ :class => 'access-item'
71	84	) +
72		- privacity_exceptions(article, tokenized_children)
	85	+ privacity_exceptions(article, tokenized_children),
	86	+ :class => 'access-itens'
73	87	)
74	88	end
75	89
...	...
...	...	@@ -59,7 +59,15 @@ module FolderHelper
59	59	@article = article
60	60
61	61	visibility_options(article,tokenized_children) +
	62	+ content_tag('h4', _('Options')) +
62	63	content_tag('div',
	64	+ content_tag('div',
	65	+ check_box(:article, :archived) +
	66	+ content_tag('span', ' ', :class => 'access-archived-icon') +
	67	+ content_tag('label', _('Read Only'), :for => 'article_archived_true') +
	68	+ content_tag('span', _('Archive to avoid votes and create new children articles'), :class => 'access-note'),
	69	+ :class => 'access-item'
	70	+ ) +
63	71	hidden_field_tag('article[accept_comments]', 0)
64	72	)
65	73	end
...	...
...	...	@@ -9,7 +9,7 @@ class Article < ActiveRecord::Base
9	9	:highlighted, :notify_comments, :display_hits, :slug,
10	10	:external_feed_builder, :display_versions, :external_link,
11	11	:author, :published_at, :person_followers, :show_to_followers,
12		- :image_builder, :display_preview
	12	+ :image_builder, :display_preview, :archived
13	13
14	14	acts_as_having_image
15	15
...	...	@@ -156,6 +156,8 @@ class Article < ActiveRecord::Base
156	156	validate :no_self_reference
157	157	validate :no_cyclical_reference, :if => 'parent_id.present?'
158	158
	159	+ validate :parent_archived?
	160	+
159	161	def no_self_reference
160	162	errors.add(:parent_id, _('self-reference is not allowed.')) if id && parent_id == id
161	163	end
...	...	@@ -490,6 +492,10 @@ class Article < ActiveRecord::Base
490	492	end
491	493	end
492	494
	495	+ def archived?
	496	+ (self.parent && self.parent.archived) \|\| self.archived
	497	+ end
	498	+
493	499	def self.folder_types
494	500	['Folder', 'Blog', 'Forum', 'Gallery']
495	501	end
...	...	@@ -636,13 +642,21 @@ class Article < ActiveRecord::Base
636	642	end
637	643
638	644	def hit
639		- self.class.connection.execute('update articles set hits = hits + 1 where id = %d' % self.id.to_i)
640		- self.hits += 1
	645	+ if !archived?
	646	+ self.class.connection.execute('update articles set hits = hits + 1 where id = %d' % self.id.to_i)
	647	+ self.hits += 1
	648	+ end
641	649	end
642	650
643	651	def self.hit(articles)
644		- Article.where(:id => articles.map(&:id)).update_all('hits = hits + 1')
645		- articles.each { \|a\| a.hits += 1 }
	652	+ ids = []
	653	+ articles.each do \|article\|
	654	+ if !article.archived?
	655	+ ids << article.id
	656	+ article.hits += 1
	657	+ end
	658	+ end
	659	+ Article.where(:id => ids).update_all('hits = hits + 1') if !ids.empty?
646	660	end
647	661
648	662	def can_display_hits?
...	...	@@ -856,4 +870,10 @@ class Article < ActiveRecord::Base
856	870	sanitizer.sanitize(text)
857	871	end
858	872
	873	+ def parent_archived?
	874	+ if self.parent_id_changed? && self.parent && self.parent.archived?
	875	+ errors.add(:parent_folder, N_('is archived!!'))
	876	+ end
	877	+ end
	878	+
859	879	end
...	...
...	...	@@ -34,7 +34,9 @@ class Comment < ActiveRecord::Base
34	34	rec.errors.add(:name, _('{fn} can only be informed for unauthenticated authors').fix_i18n)
35	35	end
36	36	end
37		-
	37	+
	38	+ validate :article_archived?
	39	+
38	40	acts_as_having_settings
39	41
40	42	xss_terminate :only => [ :body, :title, :name ], :on => 'validation'
...	...	@@ -210,4 +212,14 @@ class Comment < ActiveRecord::Base
210	212	user.present? && user == author
211	213	end
212	214
	215	+ def archived?
	216	+ self.article.archived? if self.article.present? && self.article.respond_to?(:archived?)
	217	+ end
	218	+
	219	+ protected
	220	+
	221	+ def article_archived?
	222	+ errors.add(:article, N_('associated with this comment is achived!')) if archived?
	223	+ end
	224	+
213	225	end
...	...
...	...	@@ -66,4 +66,8 @@ class Folder < Article
66	66	!self.has_posts? \|\| self.gallery?
67	67	end
68	68
	69	+ def archived?
	70	+ self.archived
	71	+ end
	72	+
69	73	end
...	...
...	...	@@ -424,6 +424,12 @@ class User < ActiveRecord::Base
424	424	@is_password_required = false
425	425	end
426	426
	427	+ def resend_activation_code
	428	+ return if self.activated?
	429	+ update_attribute(:activation_code, make_activation_code)
	430	+ self.deliver_activation_code
	431	+ end
	432	+
427	433	protected
428	434
429	435	def normalize_email
...	...
...	...	@@ -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 %>
...	...
1	1	<%= error_messages_for 'article' %>
2	2
	3	+<% if @article.archived? %>
	4	+ <%= render :partial => 'archived_warning', :locals => {:article => @article} %>
	5	+<% end %>
3	6	<div class='<%= (@article.display_media_panel? ? 'with_media_panel' : 'no_media_panel') %>'>
4	7	<%= labelled_form_for 'article', :html => { :multipart => true, :class => @type } do \|f\| %>
5	8
...	...
...	...	@@ -29,7 +29,9 @@
29	29	<%= expirable_button @page, :locale, content, url %>
30	30	<% end %>
31	31
32		- <%= 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) %>
	32	+ <% if !@page.archived? %>
	33	+ <%= 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) %>
	34	+ <% end %>
33	35
34	36	<% content = content_tag('span', label_for_clone_article(@page)) %>
35	37	<% 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 @@
64	66	<% end %>
65	67	<%= button_without_text(:feed, _('RSS feed'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
66	68	<%= @plugins.dispatch(:article_header_extra_contents, @page).collect { \|content\| instance_exec(&content) }.join("") %>
	69	+ <% if @page.archived? %>
	70	+ <%= render :partial => 'cms/archived_warning', :locals => {:article => @page} %>
	71	+ <% end %>
67	72	<%= render :partial => 'article_title', :locals => {:no_link => true} %>
68	73	<%= article_translations(@page) %>
69	74	</div>
...	...
...	...	@@ -16,7 +16,7 @@
16	16	<div id='article-sub-header'>
17	17	<% if @page.display_hits? %>
18	18	<div id="article-hits">
19		- <%= n_('Viewed one time', 'Viewed %{num} times', @page.hits) % { :num => @page.hits } %>
	19	+ <%= n_('Viewed one time %{desc}', 'Viewed %{num} times %{desc}', @page.hits) % { :num => @page.hits, :desc => @page.archived? ? '<b>'+_('(Not countable anymore)')+'</b>' : '' } %>
20	20	</div>
21	21	<% end %>
22	22
...	...