Merge branch 'noosfero' into rails4

Braulio Bhavamitra
2 parents 4352c377 8dfded9f
Showing 76 changed files with 2022 additions and 165 deletions Show diff stats
AUTHORS.md
app/controllers/my_profile/cms_controller.rb
app/controllers/public/content_viewer_controller.rb
app/controllers/public/profile_controller.rb
app/helpers/article_helper.rb
app/models/profile.rb
app/models/profile_activity.rb
app/models/scrap.rb
app/views/cms/edit.html.erb
app/views/content_viewer/_article_toolbar.html.erb
app/views/profile/_profile_members_list.html.erb
app/views/profile/members.html.erb
debian/changelog
lib/authenticated_system.rb
lib/noosfero/plugin.rb
lib/noosfero/version.rb
plugins/ldap/README.md
plugins/ldap/lib/ldap_authentication.rb
plugins/ldap/test/unit/ldap_authentication_test.rb
plugins/organization_ratings/controllers/organization_ratings_plugin_admin_controller.rb
@@ -90,15 +90,17 @@ Matheus Faria &lt;matheus.sousa.faria@gmail.com&gt;
 Maurilio Atila <cabelotaina@gmail.com>
 M for Momo <mo@rtnp.org>
 Michal Čihař <michal@cihar.com>
-Michel Felipe <mfelipeof@gmail.com>
+Michel Felipe de Oliveira Ferreira <michel.ferreira@serpro.gov.br>
 Moises Machado <moises@colivre.coop.br>
 Naíla Alves <naila@colivre.coop.br>
 Nanda Lopes <nanda.listas+psl@gmail.com>
 Niemand Jedermann <predatorix@web.de>
+Omar Junior <omarroinuj@gmail.com>
 Parley Martins <parleypachecomartins@gmail.com>
 Paulo Meirelles <paulo@softwarelivre.org>
 Pedro de Lyra <pedrodelyra@gmail.com>
 Pedro Leal
+Phillip Rohmberger <rohmberger@hotmail.de>
 Rafael de Souza Queiroz <querafael@live.com>
 Rafael Gomes <rafaelgomes@techfree.com.br>
 Rafael Martins <rmmartins@gmail.com>
@@ -112,6 +114,7 @@ Rodrigo Medeiros &lt;rodrigo.mss01@gmail.com&gt;
 Rodrigo Souto <rodrigo@colivre.coop.br>
 Ronny Kursawe <kursawe.ronny@googlemail.com>
 Samuel R. C. Vale <srcvale@holoscopio.com>
+Simiao Carvalho <simiaosimis@gmail.com>
 Tallys Martins <tallysmartins@yahoo.com.br>
 Thiago Casotti <thiago.casotti@uol.com.br>
 Thiago Kairala <thiagor.kairala@gmail.com>
@@ -123,6 +126,7 @@ Valessio Brito &lt;contato@valessiobrito.com.br&gt;
 Victor Costa <vfcosta@gmail.com>
 Victor Hugo Alves de Carvalho <victorhugodf.ac@gmail.com>
 Vinicius Cubas Brand <viniciuscb@gmail.com>
+Vitor Barbosa <vitornga15@gmail.com>
 Wilton Rodrigues <braynwilton@gmail.com>
 Yann Lugrin <yann.lugrin@liquid-concept.ch>
  
@@ -111,10 +111,7 @@ class CmsController &lt; MyProfileController
       end
     end
  
-    unless @article.kind_of?(RssFeed)
-      @escaped_body = CGI::escapeHTML(@article.body || '')
-      @escaped_abstract = CGI::escapeHTML(@article.abstract || '')
-    end
+    escape_fields @article
   end
  
   def new
@@ -185,6 +182,8 @@ class CmsController &lt; MyProfileController
       end
     end
  
+    escape_fields @article
+
     render :action => 'edit'
   end
  
@@ -534,4 +533,10 @@ class CmsController &lt; MyProfileController
     end
   end
  
+  def escape_fields article
+    unless article.kind_of?(RssFeed)
+      @escaped_body = CGI::escapeHTML(article.body || '')
+      @escaped_abstract = CGI::escapeHTML(article.abstract || '')
+    end
+  end
 end
@@ -8,6 +8,7 @@ class ContentViewerController &lt; ApplicationController
   helper TagsHelper
  
   def view_page
+
     path = get_path(params[:page], params[:format])
  
     @version = params[:version].to_i
@@ -38,7 +39,7 @@ class ContentViewerController &lt; ApplicationController
     end
  
     # At this point the page will be showed
-    @page.hit unless user_is_a_bot?
+    @page.hit unless user_is_a_bot? || already_visited?(@page)
  
     @page = FilePresenter.for @page
  
@@ -272,4 +273,18 @@ class ContentViewerController &lt; ApplicationController
     @comment_order = params[:comment_order].nil? ? 'oldest' : params[:comment_order]
   end
  
+  private
+
+  def already_visited?(element)
+    user_id = if user.nil? then -1 else current_user.id end
+    user_id = "#{user_id}_#{element.id}_#{element.class}"
+
+    if cookies.signed[:visited] == user_id
+      return true
+    else
+      cookies.permanent.signed[:visited] = user_id
+      return false
+    end
+  end
+
 end
@@ -66,7 +66,10 @@ class ProfileController &lt; PublicController
  
   def members
     if is_cache_expired?(profile.members_cache_key(params))
-      @members = profile.members_by_name.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage], :total_entries => profile.members.count)
+      sort = (params[:sort] == 'desc') ? params[:sort] : 'asc'
+      @profile_admins = profile.admins.includes(relations_to_include).order("name #{sort}").paginate(:per_page => members_per_page, :page => params[:npage])
+      @profile_members = profile.members.includes(relations_to_include).order("name #{sort}").paginate(:per_page => members_per_page, :page => params[:npage])
+      @profile_members_url = url_for(:controller => 'profile', :action => 'members')
     end
   end
  
@@ -88,7 +88,7 @@ module ArticleHelper
     content_tag( 'small', _('Who will be able to create new topics on this forum?')) +
     content_tag('div', '', slider_options) +
     hidden_field_tag('article[topic_creation]', article.topic_creation) +
-    javascript_include_tag('topic-creation-config')
+    javascript_include_tag("#{Noosfero.root}/assets/topic-creation-config.js")
   end
  
   def privacity_exceptions(article, tokenized_children)
@@ -920,7 +920,8 @@ private :generate_url, :url_options
  
   def members_cache_key(params = {})
     page = params[:npage] || '1'
-    cache_key + '-members-page-' + page
+    sort = (params[:sort] ==  'desc') ? params[:sort] : 'asc'
+    cache_key + '-members-page-' + page + '-' + sort
   end
  
   def more_recent_label
@@ -16,6 +16,7 @@ class ProfileActivity &lt; ActiveRecord::Base
  
   def self.update_activity activity
     profile_activity = ProfileActivity.where(activity_id: activity.id, activity_type: activity.class.base_class.name).first
+    return unless profile_activity
     profile_activity.send :copy_timestamps
     profile_activity.save!
     profile_activity
@@ -22,11 +22,11 @@ class Scrap &lt; ActiveRecord::Base
  
   scope :not_replies, ->{ where scrap_id: nil }
  
-  track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{|s| s.sender != s.receiver && s.sender != s.top_root.receiver}, :custom_target => :action_tracker_target
+  track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{|s| s.sender != s.receiver && s.sender != s.top_root.receiver}, :custom_target => :action_tracker_target, :custom_user => :sender
  
-  track_actions :leave_scrap_to_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.sender == s.receiver}
+  track_actions :leave_scrap_to_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.sender == s.receiver}, :custom_user => :sender
  
-  track_actions :reply_scrap_on_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.sender != s.receiver && s.sender == s.top_root.receiver}
+  track_actions :reply_scrap_on_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{|s| s.sender != s.receiver && s.sender == s.top_root.receiver}, :custom_user => :sender
  
   after_create :send_notification
  
@@ -5,8 +5,6 @@
  
   <%= hidden_field_tag("type", @type) if @type %>
  
-  <%= hidden_field_tag('parent_id', @parent_id) if @parent_id %>
-
   <%= hidden_field_tag('back_to', @back_to) %>
  
   <%= hidden_field_tag('success_back_to', @success_back_to) %>
@@ -29,10 +29,10 @@
         <%= 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.nil? ? nil : @page.parent)))) unless remove_content_button(:new, @page) %>
+      <%= 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) %>
  
       <% content = content_tag('span', label_for_clone_article(@page)) %>
-      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'new', :id => @page.id, :clone => true, :type => @page.class }) %>
+      <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'new', :id => @page.id, :clone => true,  :parent_id => (@page.folder? ? @page : @page.parent), :type => @page.class}) %>
       <%= expirable_button @page, :clone, content, url %>
     <% end %>
  
@@ -0,0 +1,16 @@
+<div id="profile-members-sort-options">
+  <%= label_tag("sort-#{role}", _("Sort by:")) %>
+  <%= select_tag("sort-#{role}",
+    options_for_select([
+      [_("Name A-Z"), 'asc'],
+      [_("Name Z-A"), 'desc'],
+    ], :selected => params[:sort])
+  ) %>
+</div>
+<ul class="profile-list-<%= role %>" >
+  <% users.each do |u| %>
+    <%= profile_image_link(u) %>
+  <% end %>
+</ul>
+
+<%= pagination_links users, :param_name => 'npage' %>
 <div class="common-profile-list-block">
  
-<h1><%= _("%s's members") % profile.name %></h1>
+<h1><%= _("Members (%d)") % @profile_members.total_entries %></h1>
+<h2 class="community-name"><%= profile.name %></h2>
  
 <% cache_timeout(profile.members_cache_key(params), 4.hours) do %>
-  <ul class='profile-list'>
-    <% @members.each do |member| %>
-      <%= profile_image_link(member) %>
-    <% end %>
-  </ul>
+  <div class="profile-members-tabs-container">
+    <% tabs = [] %>
+
+    <% div_members = content_tag :div, :class => "profile-members" do
+      render :partial => 'profile_members_list',
+                            :locals => {
+                            :users => @profile_members,
+                            :role => "members"
+                            }
+    end %>
+
+    <% tabs << {:title =>  _("%d Members") % @profile_members.total_entries,
+                     :id => "members-tab",
+                     :content => div_members
+                     } %>
  
-  <div id='pagination-profiles'>
-    <%= pagination_links @members, :param_name => 'npage' %>
-  </div>
+    <% div_admins = content_tag :div, :class => "profile-admins" do
+      render :partial => 'profile_members_list',
+                            :locals => {
+                            :users => @profile_admins,
+                            :role => "admins"
+                            }
+    end %>
+
+    <% tabs << {:title => _("%d Administrators") % @profile_admins.total_entries,
+                            :id => "admins-tab",
+                            :content => div_admins
+                            } %>
+
+    <%= render_tabs(tabs) %>
+  </div><!-- end of class="profile-members-tabs-container" -->
 <% end %>
  
 <% button_bar do %>
@@ -26,4 +49,7 @@
   <% end %>
 <% end %>
  
-</div><!-- fim class="common-profile-list-block" -->
+<%= hidden_field_tag "profile_url", @profile_members_url %>
+</div><!-- end of class="common-profile-list-block" -->
+
+<%= javascript_include_tag "members_page.js" %>
+noosfero (1.3~0.0) UNRELEASED; urgency=medium
+
+  * Noosfero 1.3 ALPHA 0
+
+ -- Antonio Terceiro <terceiro@debian.org>  Wed, 09 Sep 2015 21:27:05 -0300
+
 noosfero (1.2) wheezy; urgency=low
  
   * Noosfero 1.2
@@ -2,12 +2,12 @@ module AuthenticatedSystem
  
   protected
  
-    # See impl. from http://stackoverflow.com/a/2513456/670229
     def self.included base
-      base.around_filter do
+      # See impl. from http://stackoverflow.com/a/2513456/670229
+      base.around_filter do |&block|
         begin
           User.current = current_user
-          yield
+          block.call
         ensure
           # to address the thread variable leak issues in Puma/Thin webserver
           User.current = nil
@@ -241,6 +241,16 @@ class Noosfero::Plugin
     nil
   end
  
+  # -> Customize the way comments are counted for Profiles and Environment
+  # considering more than just articles comments
+  # Used on statistic block
+  # Ex: a plugin may want that Communities receive comments themselves
+  # as evaluations
+  # returns = the number of comments to be sum on the statistics
+  def more_comments_count owner
+    nil
+  end
+
   # -> Adds tabs to the profile
   # returns   = { :title => title, :id => id, :content => content, :start => start }
   #   title   = name that will be displayed.
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '1.2'
+  VERSION = '1.3~0.0'
 end
  
 root = File.expand_path(File.dirname(__FILE__) + '/../..')
@@ -13,6 +13,7 @@ Dependences
 See the Noosfero install file. After install Noosfero, install LDAP dependences:
  
 $ gem install net-ldap -v 0.3.1
+$ sudo apt-get install ruby-magic
  
 Enable Plugin
 -------------
@@ -19,6 +19,7 @@ require &#39;rubygems&#39;
 require 'iconv'
 require 'net/ldap'
 require 'net/ldap/dn'
+require 'magic'
  
 class LdapAuthentication
  
@@ -134,7 +135,18 @@ class LdapAuthentication
  
   def self.get_attr(entry, attr_name)
     if !attr_name.blank?
-      entry[attr_name].is_a?(Array) ? entry[attr_name].first : entry[attr_name]
+      val = entry[attr_name].is_a?(Array) ? entry[attr_name].first : entry[attr_name]
+      if val.nil?
+        Rails.logger.warn "LDAP entry #{entry.dn} has no attr #{attr_name}."
+        nil
+      elsif val == '' || val == ' '
+        Rails.logger.warn "LDAP entry #{entry.dn} has attr #{attr_name} empty."
+        ''
+      else
+        charset = Magic.guess_string_mime_encoding(val)
+        val.encode 'utf-8', charset, invalid: :replace, undef: :replace
+      end
     end
   end
+
 end
@@ -2,141 +2,177 @@ require_relative &#39;../test_helper&#39;
  
 class LdapAuthenticationTest < ActiveSupport::TestCase
  
+  def pseudoEntry(data)
+    entry = data.clone
+    def entry.dn; 'testDN'; end
+    entry
+  end
+
   def setup
     @ldap_config = load_ldap_config
   end
  
-  should "host be nil as default" do
+  should 'host be nil as default' do
     ldap = LdapAuthentication.new
     assert_nil ldap.host
   end
  
-  should "create with host passed as parameter" do
+  should 'create with host passed as parameter' do
     value = 'http://myhost.com'
     ldap = LdapAuthentication.new('host' => value)
     assert_equal value, ldap.host
   end
  
-  should "port be 389 as default" do
+  should 'port be 389 as default' do
     ldap = LdapAuthentication.new
     assert_equal 389, ldap.port
   end
  
-  should "create with port passed as parameter" do
+  should 'create with port passed as parameter' do
     value = 555
     ldap = LdapAuthentication.new('port' => value)
     assert_equal value, ldap.port
   end
  
-  should "account be nil as default" do
+  should 'account be nil as default' do
     ldap = LdapAuthentication.new
     assert_nil ldap.account
   end
  
-  should "create with account passed as parameter" do
+  should 'create with account passed as parameter' do
     value = 'uid=sector,ou=Service,ou=corp,dc=company,dc=com,dc=br'
     ldap = LdapAuthentication.new('account' => value)
     assert_equal value, ldap.account
   end
  
-  should "account_password be nil as default" do
+  should 'account_password be nil as default' do
     ldap = LdapAuthentication.new
     assert_nil ldap.account_password
   end
  
-  should "create with account_password passed as parameter" do
+  should 'create with account_password passed as parameter' do
     value = 'password'
     ldap = LdapAuthentication.new('account_password' => value)
     assert_equal value, ldap.account_password
   end
  
-  should "base_dn be nil as default" do
+  should 'base_dn be nil as default' do
     ldap = LdapAuthentication.new
     assert_nil ldap.base_dn
   end
  
-  should "create with base_dn passed as parameter" do
+  should 'create with base_dn passed as parameter' do
     value = 'dc=company,dc=com,dc=br'
     ldap = LdapAuthentication.new('base_dn' => value)
     assert_equal value, ldap.base_dn
   end
  
-  should "attr_login be nil as default" do
+  should 'attr_login be nil as default' do
     ldap = LdapAuthentication.new
     assert_nil ldap.attr_login
   end
  
-  should "create with attr_login passed as parameter" do
+  should 'create with attr_login passed as parameter' do
     value = 'uid'
     ldap = LdapAuthentication.new('attr_login' => value)
     assert_equal value, ldap.attr_login
   end
  
-  should "attr_fullname be nil as default" do
+  should 'attr_fullname be nil as default' do
     ldap = LdapAuthentication.new
     assert_nil ldap.attr_fullname
   end
  
-  should "create with attr_fullname passed as parameter" do
+  should 'create with attr_fullname passed as parameter' do
     value = 'Noosfero System'
     ldap = LdapAuthentication.new('attr_fullname' => value)
     assert_equal value, ldap.attr_fullname
   end
  
-  should "attr_mail be nil as default" do
+  should 'attr_mail be nil as default' do
     ldap = LdapAuthentication.new
     assert_nil ldap.attr_mail
   end
  
-  should "create with attr_mail passed as parameter" do
+  should 'create with attr_mail passed as parameter' do
     value = 'test@noosfero.com'
     ldap = LdapAuthentication.new('attr_mail' => value)
     assert_equal value, ldap.attr_mail
   end
  
-  should "onthefly_register be false as default" do
+  should 'onthefly_register be false as default' do
     ldap = LdapAuthentication.new
     refute ldap.onthefly_register
   end
  
-  should "create with onthefly_register passed as parameter" do
+  should 'create with onthefly_register passed as parameter' do
     value = true
     ldap = LdapAuthentication.new('onthefly_register' => value)
     assert_equal value, ldap.onthefly_register
   end
  
-  should "filter be nil as default" do
+  should 'filter be nil as default' do
     ldap = LdapAuthentication.new
     assert_nil ldap.filter
   end
  
-  should "create with filter passed as parameter" do
+  should 'create with filter passed as parameter' do
     value = 'test'
     ldap = LdapAuthentication.new('filter' => value)
     assert_equal value, ldap.filter
   end
  
-  should "tls be false as default" do
+  should 'tls be false as default' do
     ldap = LdapAuthentication.new
     refute ldap.tls
   end
  
-  should "create with tls passed as parameter" do
+  should 'create with tls passed as parameter' do
     value = true
     ldap = LdapAuthentication.new('tls' => value)
     assert_equal value, ldap.tls
   end
  
-  should "onthefly_register? return true if onthefly_register is true" do
+  should 'onthefly_register? return true if onthefly_register is true' do
     ldap = LdapAuthentication.new('onthefly_register' => true)
     assert ldap.onthefly_register?
   end
  
-  should "onthefly_register? return false if onthefly_register is false" do
+  should 'onthefly_register? return false if onthefly_register is false' do
     ldap = LdapAuthentication.new('onthefly_register' => false)
     refute ldap.onthefly_register?
   end
  
+  should 'detect and convert non utf-8 charset from ldap' do
+    entry = pseudoEntry('name' => "Jos\xE9 Jo\xE3o")
+    name = LdapAuthentication.get_attr entry, 'name'
+    assert_equal name, 'José João'
+  end
+
+  should 'dont crash when entry key is empty string' do
+    entry = pseudoEntry('name' => "")
+    name = LdapAuthentication.get_attr entry, 'name'
+    assert_equal name, ''
+  end
+
+  should 'dont crash when entry key has only a space char' do
+    entry = pseudoEntry('name' => " ")
+    name = LdapAuthentication.get_attr entry, 'name'
+    assert_equal name, ''
+  end
+
+  should 'dont crash when entry key is nil' do
+    entry = pseudoEntry('name' => nil)
+    name = LdapAuthentication.get_attr entry, 'name'
+    assert_equal name, nil
+  end
+
+  should 'dont crash when entry key does not exists' do
+    entry = pseudoEntry({})
+    name = LdapAuthentication.get_attr entry, 'name'
+    assert_equal name, nil
+  end
+
   if ldap_configured?
     should 'return the user attributes' do
       auth = LdapAuthentication.new(@ldap_config['server'])
@@ -0,0 +1,19 @@
+class OrganizationRatingsPluginAdminController < PluginAdminController
+
+  include RatingsHelper
+  helper :ratings
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+
+  def index
+  end
+
+  def update
+    if env_organization_ratings_config.update_attributes(params[:organization_ratings_config])
+      session[:notice] = _('Configuration updated successfully.')
+    else
+      session[:notice] = _('Configuration could not be saved.')
+    end
+    render :action => 'index'
+  end
+
+end
 \ No newline at end of file
@@ -0,0 +1,76 @@
+class OrganizationRatingsPluginProfileController < ProfileController
+  include RatingsHelper
+  helper :ratings
+
+  def new_rating
+    @rating_available = user_can_rate_now?
+    @users_ratings = get_ratings(profile.id).paginate(
+                      :per_page => env_organization_ratings_config.per_page,
+                      :page => params[:npage]
+                    )
+    if request.post?
+      if @rating_available
+        create_new_rate
+      else
+        session[:notice] = _("You can not vote on this %s") % profile.class.name
+      end
+    end
+  end
+
+  private
+
+  def user_can_rate_now?
+    return false unless user
+    ratings = OrganizationRating.where(
+      :organization_id => profile.id,
+      :person_id => user.id
+    )
+
+    return false if (!ratings.empty? && env_organization_ratings_config.vote_once)
+
+    if ratings.empty?
+      true
+    else
+      elapsed_time_since_last_rating = Time.zone.now - ratings.last.created_at
+      elapsed_time_since_last_rating > env_organization_ratings_config.cooldown.hours
+    end
+  end
+
+  def create_new_rate
+    rating = OrganizationRating.new(params[:organization_rating])
+    rating.person = current_user.person
+    rating.organization = profile
+    rating.value = params[:organization_rating_value] if params[:organization_rating_value]
+
+    if rating.save
+      create_rating_comment(rating)
+      session[:notice] = _("%s successfully rated!") % profile.name
+    else
+      session[:notice] = _("Sorry, there were problems rating this profile.")
+    end
+
+    redirect_to :controller => 'profile',  :action => 'index'
+  end
+
+  def create_rating_comment(rating)
+    if params[:comments]
+        comment_task = CreateOrganizationRatingComment.create!(
+          params[:comments].merge(
+            :requestor => rating.person,
+            :organization_rating_id => rating.id,
+            :target => rating.organization
+          )
+        )
+        comment_task.finish if can_perform?(params)
+    end
+  end
+
+  def can_perform? (params)
+    (params[:comments][:body].blank? ||
+    !env_organization_ratings_config.are_moderated)
+  end
+
+  def permission
+    :manage_memberships
+  end
+end
@@ -0,0 +1,12 @@
+class CreateOrganizationRatings < ActiveRecord::Migration
+  def change
+    create_table :organization_ratings do |t|
+      t.belongs_to :organization
+      t.belongs_to :person
+      t.belongs_to :comment
+      t.integer :value
+
+      t.timestamps
+    end
+  end
+end
@@ -0,0 +1,14 @@
+class CreateOrganizationRatingsConfig < ActiveRecord::Migration
+
+  def change
+    create_table :organization_ratings_configs do |t|
+     t.belongs_to :environment
+     t.integer :cooldown, :integer, :default => 24
+     t.integer :default_rating, :integer, :default => 1
+     t.string  :order, :string, :default => "recent"
+     t.integer :per_page, :integer, :default => 10
+     t.boolean :vote_once, :boolean, :default => false
+     t.boolean :are_moderated, :boolean, :default => true
+    end
+  end
+end
@@ -0,0 +1,11 @@
+class AddCommentsCountToProfile < ActiveRecord::Migration
+  def self.up
+    change_table :profiles do |t|
+      t.integer :comments_count
+    end
+  end
+
+  def self.down
+    remove_column :profiles, :comments_count
+  end
+end
 \ No newline at end of file
@@ -0,0 +1,30 @@
+Feature: rate_community
+  As a user
+  I want to be able rate a community
+  So that users can see my feedback about that community
+
+  Background:
+    Given plugin "OrganizationRatings" is enabled on environment
+    Given the following user
+      | login     | name       |
+      | joaosilva | Joao Silva |
+    And the following community
+      | identifier  | name         |
+      | mycommunity | My Community |
+    And the following blocks
+      | owner       | type                |
+      | mycommunity | AverageRatingBlock  |
+      | mycommunity | OrganizationRatingsBlock  |
+    And the environment domain is "localhost"
+    And I am logged in as "joaosilva"
+
+  @selenium
+  Scenario: display rate button inside average block
+    Given I am on mycommunity's homepage
+    Then I should see "Rate this Community" within ".average-rating-block"
+    And I should see "Be the first to rate" within ".average-rating-block"
+
+  @selenium
+  Scenario: display rate button inside communities ratings block
+    Given I am on mycommunity's homepage
+    Then I should see "Rate Community" within ".make-report-block"
@@ -0,0 +1,30 @@
+class AverageRatingBlock < Block
+  include RatingsHelper
+
+  def self.description
+    _('Organization Average Rating')
+  end
+
+  def help
+    _('This block displays the organization average rating.')
+  end
+
+  def content(args = {})
+    profile_identifier = self.owner.identifier
+    average_rating = OrganizationRating.average_rating self.owner.id
+
+    proc do
+      render(
+        :file => 'blocks/display_organization_average_rating',
+        :locals => {
+          :profile_identifier => profile_identifier,
+          :average_rating => average_rating
+        }
+      )
+    end
+  end
+
+  def cacheable?
+    false
+  end
+end
@@ -0,0 +1,131 @@
+class CreateOrganizationRatingComment < Task
+  include Rails.application.routes.url_helpers
+
+  validates_presence_of :requestor_id, :organization_rating_id, :target_id
+
+  settings_items :organization_rating_id, :type => Integer, :default => nil
+  settings_items :organization_rating_comment_id, :type => Integer, :default => nil
+
+  attr_accessible :organization_rating_id, :body, :requestor
+  attr_accessible :reject_explanation, :target
+
+  before_save :update_comment_body
+
+  DATA_FIELDS = ['body']
+  DATA_FIELDS.each do |field|
+    settings_items field.to_sym
+  end
+
+  def update_comment_body
+    if self.organization_rating_comment_id.nil?
+      create_comment
+    else
+      comment = Comment.find_by_id(self.organization_rating_comment_id)
+      comment.body = get_comment_message
+      comment.save
+    end
+  end
+
+  def create_comment
+    if (self.body && !self.body.blank?)
+      comment_body = _("Comment waiting for approval")
+      comment = Comment.create!(:source => self.target, :body => comment_body, :author => self.requestor)
+
+
+      self.organization_rating_comment_id = comment.id
+      link_comment_with_its_rating(comment)
+    end
+  end
+
+  def link_comment_with_its_rating(user_comment)
+    rating = OrganizationRating.find(self.organization_rating_id)
+    rating.comment = user_comment
+    rating.save
+  end
+
+  def get_comment_message
+    if self.status == Status::CANCELLED
+      _("Comment rejected")
+    elsif self.status == Status::FINISHED
+      self.body
+    else
+      _("No comment")
+    end
+  end
+
+  def accept_details
+    true
+  end
+
+  def title
+    _("New Comment")
+  end
+
+  def information
+    message = _("<a href=%{requestor_url}>%{requestor}</a> wants to create a comment in this %{target_class}") %
+    {:requestor_url => url_for(self.requestor.url), :requestor => self.requestor.name, :target_class => self.target.class.name.downcase}
+
+    {:message => message}
+  end
+
+  def reject_details
+    true
+  end
+
+  def icon
+    {:type => :profile_image, :profile => requestor, :url => requestor.url}
+  end
+
+  # tells if this request was rejected
+  def rejected?
+    self.status == Task::Status::CANCELLED
+  end
+
+  # tells if this request was appoved
+  def approved?
+    self.status == Task::Status::FINISHED
+  end
+
+  def target_notification_description
+    _("%{requestor} wants to create a comment in this \"%{target}\"") %
+    {:requestor => self.requestor.name, :target => self.target.class.name.downcase }
+  end
+
+  def target_notification_message
+    _("User \"%{user}\" just requested to create a comment in the %{target_class}
+      \"%{target_name}\".
+      You have to approve or reject it through the \"Pending Validations\"
+      section in your control panel.\n") %
+    { :user => self.requestor.name, :target_class => self.target.class.name.downcase, :target_name => self.target.name }
+  end
+
+  def task_created_message
+    _("Your request for commenting at %{target} was
+      just sent. Environment administrator will receive it and will approve or
+      reject your request according to his methods and criteria.
+      You will be notified as soon as environment administrator has a position
+      about your request.") %
+    { :target => self.target.name }
+  end
+
+  def task_cancelled_message
+    _("Your request for commenting at %{target} was
+      not approved by the environment administrator. The following explanation
+      was given: \n\n%{explanation}") %
+    { :target => self.target.name,
+      :explanation => self.reject_explanation }
+  end
+
+  def task_finished_message
+    _('Your request for commenting was approved.
+      You can access %{url} to see your comment.') %
+    { :url => ratings_url }
+  end
+
+  private
+
+  def ratings_url
+    url = url_for(self.target.public_profile_url) + "/plugin/organization_ratings/new_rating"
+  end
+
+end
@@ -0,0 +1,6 @@
+require_dependency "comment"
+
+Comment.class_eval do
+
+  has_one :organization_rating
+end
@@ -0,0 +1,5 @@
+require_dependency "environment"
+
+class Environment
+  has_one :organization_ratings_config
+end
@@ -0,0 +1,7 @@
+require_dependency 'organization'
+
+Organization.class_eval do
+  has_many :organization_ratings
+
+  has_many :comments, :class_name => 'Comment', :foreign_key => 'source_id', :dependent => :destroy, :order => 'created_at asc'
+end
@@ -0,0 +1,5 @@
+require_dependency 'person'
+
+Person.class_eval do
+  has_many :organization_ratings
+end
@@ -0,0 +1,25 @@
+class OrganizationRating < ActiveRecord::Base
+  belongs_to :person
+  belongs_to :organization
+  belongs_to :comment
+
+  attr_accessible :value, :person, :organization, :comment
+
+  validates :value,
+            :presence => true, :inclusion => {
+              in: 1..5, message: _("must be between 1 and 5")
+            }
+
+  validates :organization_id, :person_id,
+            :presence => true
+
+
+  def self.average_rating organization_id
+    average = OrganizationRating.where(organization_id: organization_id).average(:value)
+
+    if average
+      (average - average.truncate) >= 0.5 ? average.ceil : average.floor
+    end
+  end
+
+end
@@ -0,0 +1,30 @@
+class OrganizationRatingsBlock < Block
+  include RatingsHelper
+
+  def self.description
+    _('Organization Ratings')
+  end
+
+  def help
+    _('This block displays the community ratings.')
+  end
+
+  def content(args = {})
+    block = self
+
+    proc do
+      render(
+        :file => 'blocks/organization_ratings_block',
+        :locals => {:block => block}
+      )
+    end
+  end
+
+  def limit_number_of_ratings
+    env_organization_ratings_config.per_page
+  end
+
+  def cacheable?
+    false
+  end
+end
@@ -0,0 +1,53 @@
+class OrganizationRatingsConfig < ActiveRecord::Base
+
+  belongs_to :environment
+
+  attr_accessible :cooldown, :default_rating, :order, :per_page
+  attr_accessible :vote_once, :are_moderated, :environment_id
+
+  ORDER_OPTIONS = {recent: _('More Recent'), best: _('Best Ratings')}
+
+  MINIMUM_RATING = 1
+  MAX_COOLDOWN = 1000
+
+  validates :default_rating,
+            :presence => true, :numericality => {
+              greater_than_or_equal_to: MINIMUM_RATING,
+              less_than_or_equal_to: 5
+            }
+
+  validates :cooldown,
+            :presence => true, :numericality => {
+              greater_than_or_equal_to: 0,
+              less_than_or_equal_to: MAX_COOLDOWN
+            }
+
+  validates :per_page,
+            :presence => true, :numericality => {
+              :greater_than_or_equal_to => 5,
+              :less_than_or_equal_to  => 20
+            }
+
+
+  def order_options
+    ORDER_OPTIONS
+  end
+
+  def minimum_ratings
+    MINIMUM_RATING
+  end
+
+  def max_cooldown
+    MAX_COOLDOWN
+  end
+
+  class << self
+    def instance
+      environment = Environment.default
+      environment.organization_ratings_config || create(environment_id: environment.id)
+    end
+
+    private :new
+  end
+
+end
@@ -0,0 +1,73 @@
+class OrganizationRatingsPlugin < Noosfero::Plugin
+  include Noosfero::Plugin::HotSpot
+
+  def self.plugin_name
+    "Organization Ratings"
+  end
+
+  def self.plugin_description
+    _("A plugin that allows you to rate a organization and comment about it.")
+  end
+
+  module Hotspots
+    def organization_ratings_plugin_comments_extra_fields
+      nil
+    end
+
+    def organization_ratings_title
+      nil
+    end
+
+    def organization_ratings_plugin_star_message
+      nil
+    end
+
+    def organization_ratings_plugin_extra_fields_show_data user_rating
+      nil
+    end
+  end
+
+  # Plugin Hotspot to display the average rating
+  def display_organization_average_rating organization
+    unless organization.nil?
+      average_rating = OrganizationRating.average_rating organization.id
+
+      Proc::new {
+        render :file => 'blocks/display_organization_average_rating',
+               :locals => {
+                 :profile_identifier => organization.identifier,
+                 :average_rating => average_rating
+               }
+      }
+    end
+  end
+
+  def more_comments_count owner
+    if owner.kind_of?(Environment) then
+      owner.profiles.sum(:comments_count)
+    elsif owner.kind_of?(Profile) then
+      owner.comments_count
+    else
+      0
+    end
+  end
+
+  def self.extra_blocks
+    {
+      OrganizationRatingsBlock => {:type => [Enterprise, Community], :position => ['1']},
+      AverageRatingBlock => {:type => [Enterprise, Community]}
+    }
+  end
+
+  def stylesheet?
+    true
+  end
+
+  def js_files
+    %w(
+      public/rate.js
+      public/comunities_rating_management.js
+    )
+  end
+
+end
@@ -0,0 +1,15 @@
+module RatingsHelper
+
+  def env_organization_ratings_config
+    OrganizationRatingsConfig.instance
+  end
+
+  def get_ratings (profile_id)
+    order_options = env_organization_ratings_config.order_options
+    if env_organization_ratings_config.order.downcase == order_options[:recent]
+      ratings = OrganizationRating.where(organization_id: profile_id).order("value DESC")
+    else
+      ratings = OrganizationRating.where(organization_id: profile_id).order("created_at DESC")
+    end
+  end
+end
 \ No newline at end of file
@@ -0,0 +1,35 @@
+(function($) {
+  "use strict";
+
+  var VoteOnce = {
+    init: function() {
+      this.cacheDom();
+      this.setEvents();
+    },
+
+
+    cacheDom: function() {
+      this.$vote_once_checkbox = $("#environment_organization_ratings_vote_once");
+      this.$hours_timer_input = $("#environment_organization_ratings_cooldown");
+    },
+
+
+    setEvents: function() {
+      this.$vote_once_checkbox.on("click", this.verifyHoursTimerDisable.bind(this));
+    },
+
+
+    verifyHoursTimerDisable: function() {
+      if (this.$vote_once_checkbox.is(":checked")) {
+        this.$hours_timer_input.attr("disabled", "disabled");
+      } else {
+        this.$hours_timer_input.removeAttr("disabled");
+      }
+    }
+  }
+
+
+  $(document).ready(function() {
+    VoteOnce.init();
+  });
+}) (jQuery);
@@ -0,0 +1,122 @@
+;(function($, undefined) {
+  "use strict";
+
+  /*
+  * All global data that are used in the stars feature.
+  */
+  var DATA = {
+    selected_rate: 0, // The actual selected star when the user click on a star
+    maximum_stars: 5, // (const) The maximum number of allowed stars
+    minimum_stars: 1, // (const) The minimum number of allowed stars
+    DATA_RATE_ATTRIBUTE: "data-star-rate", // (const) The data attribute with the star rate
+    NOT_SELECTED_VALUE: 0 // (const) The value when there is no selected rate
+  }
+
+
+  /*
+  * Prepare the global data that are variable.
+  * If the user already rated the organization, set the selected_rate as the rated value
+  */
+  function set_global_data() {
+    var selected_rate = parseInt($("#selected-star-rate").val());
+    var minimum_stars = parseInt($("#minimum_stars").val());
+    DATA.selected_rate = selected_rate;
+    DATA.minimum_stars = minimum_stars;
+  }
+
+
+  /*
+  * Given a start rate, an end rate and the elements, it makes a regex that filter
+  * the elements by the given range and returns it.
+  */
+  function star_filter(start, end, elements) {
+    var test_regex = undefined;
+
+    // Verify if it is a valid range and makes its range regex: /[start-end]/
+    if (end >= start) {
+      test_regex = new RegExp("["+(start)+"-"+(end)+"]");
+    } else {
+      // If the range is invalid, make a regex that will return no element
+      test_regex = new RegExp("[]");
+    }
+
+    // Filter the elements that are in the given range
+    var result = elements.filter(function(i, element) {
+      var rate = parseInt(element.getAttribute(DATA.DATA_RATE_ATTRIBUTE));
+
+      return test_regex.test(rate);
+    });
+
+    return result;
+  }
+
+
+  /*
+  * Show or hide the stars depending on the mouse position and the limit rate.
+  * Given the mouseover rate, the limit rate and the css classes to be swapped,
+  *
+  * It verify if the user already selected a star rate:
+  * If true:
+  *   It swap the css classes from the selected star up to the given limit rate
+  * If false:
+  *   It swap the css classes from the minimum rate up to the mouseover rate
+  */
+  function change_stars_class(rate_mouseover, limit_rate, remove_class, add_class) {
+    var previous_stars = undefined;
+
+    // The default not selected rate value is 0 and minimum is 1.
+    if (DATA.selected_rate >= DATA.minimum_stars) {
+      previous_stars = star_filter(DATA.selected_rate+1, limit_rate, $("."+remove_class));
+    } else {
+      previous_stars = star_filter(DATA.minimum_stars, rate_mouseover, $("."+remove_class));
+    }
+
+    previous_stars.switchClass(remove_class, add_class);
+  }
+
+
+  /*
+  * Sets the stars mouse events.
+  */
+  function set_star_hover_actions() {
+    $(".star-negative, .star-positive")
+      .on("mouseover", function() { // On mouse over, show the current rate star
+        var rate_mouseover = parseInt(this.getAttribute(DATA.DATA_RATE_ATTRIBUTE));
+
+        change_stars_class(rate_mouseover, rate_mouseover, "star-negative", "star-positive");
+      })
+
+      .on("mouseout", function() { // On mouse out, hide the stars
+        var rate_mouseover = parseInt(this.getAttribute(DATA.DATA_RATE_ATTRIBUTE));
+
+        change_stars_class(rate_mouseover, DATA.maximum_stars, "star-positive", "star-negative");
+      })
+
+      .on("click", function() { // On mouse click, set the selected star rate
+        var rate_mouseover = parseInt(this.getAttribute(DATA.DATA_RATE_ATTRIBUTE));
+
+        // If the new rate is different from actual, update it
+        if (rate_mouseover !== DATA.selected_rate && rate_mouseover > DATA.minimum_stars) {
+          DATA.selected_rate = rate_mouseover;
+        } else { // or else, uncheck it
+          DATA.selected_rate = DATA.minimum_stars;
+        }
+
+        // Mark the selected_rate
+        $("#selected-star-rate").val(DATA.selected_rate);
+
+        var star_notice = $(".star-notice");
+        star_notice.find("span").html(DATA.selected_rate);
+        star_notice.removeClass("star-hide");
+      });
+  }
+
+
+  /*
+  * When the page DOM is ready, set all the stars events
+  */
+  $(document).ready(function() {
+    set_global_data();
+    set_star_hover_actions();
+  });
+}) (jQuery);
@@ -0,0 +1,200 @@
+.star-container {
+  width: 100%;
+  height: 20px;
+}
+
+.star-negative, .star-positive {
+  width: 20px;
+  height: 20px;
+  background-repeat: no-repeat;
+  margin-right: 2px;
+  position: relative;
+  float: left;
+  cursor: pointer;
+}
+
+.star-negative {
+  background-image: url('public/images/star-negative.png');
+}
+
+.star-positive {
+  background-image: url('public/images/star-positive.png');
+}
+
+.small-star-negative, .small-star-positive {
+  background-repeat: no-repeat;
+  float: left;
+  height: 15px;
+  margin-right: 2px;
+  position: relative;
+  width: 15px;
+}
+
+.small-star-negative {
+  background-image: url('public/images/small-star-negative.png');
+}
+
+.small-star-positive {
+  background-image: url('public/images/small-star-positive.png');
+}
+
+.medium-star-negative, .medium-star-positive {
+  background-repeat: no-repeat;
+  float: left;
+  height: 20px;
+  margin-right: 2px;
+  position: relative;
+  width: 20px;
+}
+
+.medium-star-positive {
+  background-image: url('public/images/star-positive-medium.png');
+}
+
+.medium-star-negative {
+  background-image: url('public/images/star-negative-medium.png');
+}
+
+.star-hide {
+  display: none;
+}
+
+.organization-average-rating-container {
+  border-top: 1px dotted #D3D6DE;
+  margin-top: 20px;
+  padding-top: 10px;
+}
+
+.organization-average-rating-container .star-rate-text {
+  float: left;
+  margin-right: 10px;
+  padding-top: 5px;
+}
+
+.organization-average-rating-container .rating-invitation {
+  font-size: 14px;
+  float: left;
+  margin-right: 10px;
+  padding-top: 3px;
+}
+
+.organization-average-rating-container .star-container {
+  float: left;
+  width: 120px;
+}
+
+.organization-average-rating-container .rate-this-organization {
+  border-left: 1px dotted #D3D6DE;
+  float: left;
+  padding: 4px 0px 2px 10px;
+}
+
+.star-rate-data {
+  width: 100%;
+  padding-top: 20px;
+  position: relative;
+  overflow: auto;
+}
+
+.star-profile-information, .star-rate-form {
+  display: table-cell;
+  vertical-align: top;
+  width: 362px;
+}
+
+.star-profile-information {
+  width: 134px;
+}
+
+.star-rate-form {
+  display: table-cell;
+  vertical-align: top;
+}
+
+.star-profile-image, .star-profile-name {
+  text-align: center;
+}
+
+.star-profile-name {
+  word-break: break-word;
+  margin: auto;
+  margin-top: 5px;
+  width: 66px;
+}
+
+.star-rate-data .star-rate-form .star-comment-container .formfield textarea {
+  width: 361px;
+}
+
+/************* Users ratings list ****************/
+
+.ratings-list .user-rating-block,
+.ratings-list .make-report-block {
+  border-top: 1px solid #D3D6DE;
+  margin-top: 25px;
+  padding-top: 20px;
+}
+
+.ratings-list .make-report-block {
+  padding-bottom: 25px;
+}
+
+.ratings-list .see-more{
+  border-top: 1px solid #D3D6DE;
+}
+.ratings-list .user-rating-block .user-testimony-container {
+  display: table-cell;
+  padding-left: 20px;
+}
+
+.ratings-list .make-report-block .make-report-container {
+  display: table-cell;
+}
+
+.ratings-list .user-rating-block .user-testimony-container .star-container {
+  display: table-cell;
+}
+
+.ratings-list .user-rating-block .user-testimony-container .testimony-rate-date {
+  display: table-cell;
+  max-width: 95px;
+  min-width: 95px;
+  padding-right: 160px;
+  white-space: nowrap;
+}
+
+.ratings-list .user-rating-block .user-testimony-container .user-testimony {
+  margin-top: 10px;
+  word-break: break-word;
+}
+
+.ratings-list .make-report-block .make-report-container .make-report-message {
+  font-size: 14px;
+  font-style: italic;
+  word-break: break-word;
+}
+
+.ratings-list .make-report-block .make-report-container .button-bar {
+  overflow: auto;
+  padding-top: 15px;
+}
+
+.ratings-list .user-rating-block .star-profile-information {
+  border-right: 1px dotted #D3D6DE;
+}
+
+.ratings-list .icon-arrow-right-p {
+  background: url(/designs/themes/base/imgs/arrow-right-p.png) 100% 50% no-repeat;
+  display: block;
+  float: right;
+  margin-top: 20px;
+  padding-right: 15px;
+}
+
+.task_information .comment {
+  padding-left: 60px;
+}
+
+.average-rating-block {
+  height: 55px;
+}
@@ -0,0 +1,49 @@
+require File.expand_path(File.dirname(__FILE__)) + '/../../../../test/test_helper'
+require File.expand_path(File.dirname(__FILE__)) + '/../../controllers/organization_ratings_plugin_admin_controller'
+
+# Re-raise errors caught by the controller.
+class OrganizationRatingsPluginAdminController; def rescue_action(e) raise e end; end
+
+class OrganizationRatingsPluginAdminControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = OrganizationRatingsPluginAdminController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    @environment = Environment.default
+    @environment.enabled_plugins = ['OrganizationRatingsPlugin']
+    @environment.save
+
+    @community = Community.create(:name => "TestCommunity")
+
+    login_as(create_admin_user(@environment))
+  end
+
+  test "should update organization rating plugin configuration" do
+    post :update,  :organization_ratings_config => { :default_rating => 5,
+                                                            :cooldown => 12,
+                                                            :order => "recent",
+                                                            :per_page => 10,
+                                                            :vote_once => true }
+
+    assert :success
+    @environment.reload
+    assert_equal 5, @environment.organization_ratings_config.default_rating
+    assert_equal "Configuration updated successfully.", session[:notice]
+  end
+
+  test "should not update organization rating plugin configuration with negative cooldown time" do
+    post :update,  :organization_ratings_config => { :default_rating => 5,
+                                                  :cooldown => -50,
+                                                  :order => "recent",
+                                                  :per_page => 10,
+                                                  :vote_once => true }
+
+    assert :success
+    @environment.reload
+    assert_equal 24, @environment.organization_ratings_config.cooldown
+    assert_equal "Configuration could not be saved.", session[:notice]
+  end
+end
+
@@ -0,0 +1,104 @@
+require File.expand_path(File.dirname(__FILE__)) + '/../../../../test/test_helper'
+require File.expand_path(File.dirname(__FILE__)) + '/../../controllers/organization_ratings_plugin_profile_controller'
+
+# Re-raise errors caught by the controller.
+class OrganizationRatingsPluginProfileController; def rescue_action(e) raise e end; end
+
+class OrganizationRatingsPluginProfileControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = OrganizationRatingsPluginProfileController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    @environment = Environment.default
+    @environment.enabled_plugins = ['OrganizationRatingsPlugin']
+    @environment.save
+
+    @person = create_user('testuser').person
+    @community = Community.create(:name => "TestCommunity")
+    @enterprise = fast_create(Enterprise)
+    @config = OrganizationRatingsConfig.instance
+    login_as(@person.identifier)
+    @controller.stubs(:logged_in?).returns(true)
+    @controller.stubs(:current_user).returns(@person.user)
+  end
+
+  test "should add new comment to community" do
+    post :new_rating, profile: @community.identifier, :comments => {:body => "This is a test"}, :organization_rating_value => 4
+    assert_equal "#{@community.name} successfully rated!", session[:notice]
+  end
+
+  test "Create community_rating without comment body" do
+    post :new_rating, profile: @community.identifier, :comments => {:body => ""}, :organization_rating_value => 2
+
+    assert_equal "#{@community.name} successfully rated!", session[:notice]
+  end
+
+  test "Do not create community_rating without a rate value" do
+    post :new_rating, profile: @community.identifier, :comments => {:body => ""}, :organization_rating_value => nil
+
+    assert_equal "Sorry, there were problems rating this profile.", session[:notice]
+  end
+
+  test "do not create two ratings on Community when vote once config is true" do
+    post :new_rating, profile: @community.identifier, :comments => {:body => "This is a test"}, :organization_rating_value => 3
+
+    assert_equal "#{@community.name} successfully rated!", session[:notice]
+
+    @environment.organization_ratings_config.vote_once = true
+    @environment.save
+
+    post :new_rating, profile: @community.identifier, :comments => {:body => "This is a test 2"}, :organization_rating_value => 3
+    assert_equal "You can not vote on this Community", session[:notice]
+  end
+
+  test "do not create two ratings on Enterprise when vote once config is true" do
+    post :new_rating, profile: @enterprise.identifier, :comments => {:body => "This is a test"}, :organization_rating_value => 3
+
+    assert_equal "#{@enterprise.name} successfully rated!", session[:notice]
+
+    @environment.organization_ratings_config.vote_once = true
+    @environment.save
+
+    post :new_rating, profile: @enterprise.identifier, :comments => {:body => "This is a test 2"}, :organization_rating_value => 3
+    assert_equal "You can not vote on this Enterprise", session[:notice]
+  end
+
+  test "should count organization ratings on statistic block when block owner = Environment" do
+    block = StatisticsBlock.new
+    enterprise = fast_create(Enterprise)
+    post :new_rating, profile: enterprise.identifier, :comments => {:body => "body board"}, :organization_rating_value => 1
+    enterprise.reload
+    @environment.reload
+    block.expects(:owner).at_least_once.returns(@environment)
+    assert_equal 1, block.comments
+  end
+
+
+  test "should count organization ratings on statistic block when block owner = Profile" do
+    @config.cooldown = 0
+    @config.save
+
+    block = StatisticsBlock.new
+
+    post :new_rating, profile: @community.identifier, :comments => {:body => "body board"}, :organization_rating_value => 1
+    post :new_rating, profile: @community.identifier, :comments => {:body => "body surf"}, :organization_rating_value => 5
+
+    block.expects(:owner).at_least_once.returns(@community)
+    @community.reload
+    assert_equal 2, block.comments
+  end
+
+  test "Display unavailable rating message for users that must wait the rating cooldown time" do
+    post :new_rating, profile: @community.identifier, :comments => {:body => ""}, :organization_rating_value => 3
+    assert_not_match(/The administrators set the minimum time of/, @response.body)
+    valid_rating = OrganizationRating.last
+
+    post :new_rating, profile: @community.identifier, :comments => {:body => ""}, :organization_rating_value => 3
+    assert_match(/The administrators set the minimum time of/, @response.body)
+    new_rating = OrganizationRating.last
+
+    assert_equal valid_rating.id, new_rating.id
+  end
+end
@@ -0,0 +1,43 @@
+require File.expand_path(File.dirname(__FILE__)) + '/../../../../test/test_helper'
+
+class OrganizationRatingConfigTest < ActiveSupport::TestCase
+
+  def setup
+    @environment = Environment.default
+    @environment.enabled_plugins = ['OrganizationRatingsPlugin']
+    @environment.save
+    @organization_ratings_config = OrganizationRatingsConfig.instance
+  end
+
+  test "Community ratings config default rating validation" do
+    @organization_ratings_config.default_rating = 0
+    @organization_ratings_config.save
+
+    assert_equal false, @organization_ratings_config.valid?
+    assert_equal "must be greater than or equal to 1", @organization_ratings_config.errors[:default_rating].first
+
+    @organization_ratings_config.default_rating = 6
+    assert_equal false, @organization_ratings_config.valid?
+
+    assert_equal "must be less than or equal to 5", @organization_ratings_config.errors[:default_rating].first
+  end
+
+  test "Communities ratings config cooldown validation" do
+    @organization_ratings_config.cooldown = -1
+    assert_equal false, @organization_ratings_config.valid?
+
+    assert_equal "must be greater than or equal to 0", @organization_ratings_config.errors[:cooldown].first
+  end
+
+  # test "communities ratings per page validation" do
+  #   environment = Environment.new :communities_ratings_per_page => 4
+  #   environment.valid?
+
+  #   assert_equal "must be greater than or equal to 5", environment.errors[:communities_ratings_per_page].first
+
+  #   environment.communities_ratings_per_page = 21
+  #   environment.valid?
+
+  #   assert_equal "must be less than or equal to 20", environment.errors[:communities_ratings_per_page].first
+  # end
+end
@@ -0,0 +1,154 @@
+require File.expand_path(File.dirname(__FILE__)) + '/../../../../test/test_helper'
+
+class OrganizationRatingTest < ActiveSupport::TestCase
+  test "The value must be between 1 and 5" do
+    organization_rating1 = OrganizationRating.new :value => -1
+    organization_rating2 = OrganizationRating.new :value => 6
+
+    assert_equal false, organization_rating1.valid?
+    assert_equal false, organization_rating2.valid?
+
+    assert_equal true, organization_rating1.errors[:value].include?("must be between 1 and 5")
+    assert_equal true, organization_rating2.errors[:value].include?("must be between 1 and 5")
+
+    organization_rating1.value = 1
+    organization_rating1.valid?
+
+    organization_rating2.value = 5
+    organization_rating2.valid?
+
+    assert_equal false, organization_rating1.errors[:value].include?("must be between 1 and 5")
+    assert_equal false, organization_rating2.errors[:value].include?("must be between 1 and 5")
+  end
+
+  test "Create task for create a rating comment" do
+    person = create_user('molly').person
+    person.email = "person@email.com"
+    person.save!
+
+    community = fast_create(Community)
+    community.add_admin(person)
+
+    organization_rating = OrganizationRating.create!(
+        :value => 3,
+        :person => person,
+        :organization => community
+    )
+
+    create_organization_rating_comment = CreateOrganizationRatingComment.create!(
+      :requestor => person,
+      :organization_rating_id => organization_rating.id,
+      :target => community
+    )
+
+    assert community.tasks.include?(create_organization_rating_comment)
+  end
+
+    test "Check comment message when Task status = ACTIVE" do
+    person = create_user('molly').person
+    person.email = "person@email.com"
+    person.save!
+
+    community = fast_create(Community)
+    community.add_admin(person)
+
+
+    organization_rating = OrganizationRating.create!(
+        :value => 3,
+        :person => person,
+        :organization => community
+    )
+
+    create_organization_rating_comment = CreateOrganizationRatingComment.create!(
+      :requestor => person,
+      :organization_rating_id => organization_rating.id,
+      :target => community,
+      :body => "sample comment"
+    )
+    assert_equal 1, create_organization_rating_comment.status
+    message = "Comment waiting for approval"
+    comment = Comment.find_by_id(create_organization_rating_comment.organization_rating_comment_id)
+    assert_equal message, comment.body
+  end
+
+  test "Check comment message when Task status = CANCELLED" do
+    person = create_user('molly').person
+    person.email = "person@email.com"
+    person.save!
+
+    community = fast_create(Community)
+    community.add_admin(person)
+
+
+    organization_rating = OrganizationRating.create!(
+        :value => 3,
+        :person => person,
+        :organization => community
+    )
+
+    create_organization_rating_comment = CreateOrganizationRatingComment.create!(
+      :requestor => person,
+      :organization_rating_id => organization_rating.id,
+      :target => community,
+      :body => "sample comment"
+    )
+    create_organization_rating_comment.cancel
+    assert_equal 2, create_organization_rating_comment.status
+    message = "Comment rejected"
+    comment = Comment.find_by_id(create_organization_rating_comment.organization_rating_comment_id)
+    assert_equal message, comment.body
+  end
+
+  test "Check comment message when Task status = FINISHED" do
+    person = create_user('molly').person
+    person.email = "person@email.com"
+    person.save!
+
+    community = fast_create(Community)
+    community.add_admin(person)
+
+    comment = Comment.create!(source: community,
+                                                 body: "regular comment",
+                                                 author: person)
+
+    organization_rating = OrganizationRating.create!(
+        :value => 3,
+        :person => person,
+        :organization => community,
+        :comment => comment
+    )
+
+    create_organization_rating_comment = CreateOrganizationRatingComment.create!(
+          :body => comment.body,
+          :requestor => organization_rating.person,
+          :organization_rating_id => organization_rating.id,
+          :target => organization_rating.organization,
+          :body => "sample comment"
+      )
+
+    create_organization_rating_comment.finish
+    assert_equal 3, create_organization_rating_comment.status
+    message = "sample comment"
+    comment = Comment.find_by_id(create_organization_rating_comment.organization_rating_comment_id)
+    assert_equal message, comment.body
+  end
+
+
+  test "Should calculate community's rating average" do
+    community = fast_create Community
+    p1 = fast_create Person, :name=>"Person 1"
+    p2 = fast_create Person, :name=>"Person 2"
+    p3 = fast_create Person, :name=>"Person 3"
+
+    OrganizationRating.create! :value => 2, :organization => community, :person => p1
+    OrganizationRating.create! :value => 3, :organization => community, :person => p2
+    OrganizationRating.create! :value => 5, :organization => community, :person => p3
+
+    assert_equal 3, OrganizationRating.average_rating(community)
+
+    p4 = fast_create Person, :name=>"Person 4"
+    OrganizationRating.create! :value => 4, :organization => community, :person => p4
+
+    assert_equal 4, OrganizationRating.average_rating(community)
+  end
+end
@@ -0,0 +1,63 @@
+require File.expand_path(File.dirname(__FILE__)) + '/../../../../test/test_helper'
+require 'ratings_helper'
+
+class RatingsHelperTest < ActiveSupport::TestCase
+  include RatingsHelper
+
+  def setup
+
+    @environment = Environment.default
+    @environment.enabled_plugins = ['OrganizationRatingsPlugin']
+    @environment.save
+    @person = create_user('testuser').person
+    @community = Community.create(:name => "TestCommunity")
+    @organization_ratings_config = OrganizationRatingsConfig.instance
+  end
+
+  should "get the ratings of a community ordered by most recent ratings" do
+    ratings_array = []
+
+    first_rating = OrganizationRating.new
+    first_rating.organization = @community
+    first_rating.person = @person
+    first_rating.value = 3
+    first_rating.save
+
+    most_recent_rating = OrganizationRating.new
+    most_recent_rating.organization = @community
+    most_recent_rating.person = @person
+    most_recent_rating.value = 5
+    sleep 2
+    most_recent_rating.save
+
+    ratings_array << most_recent_rating
+    ratings_array << first_rating
+
+    assert_equal @organization_ratings_config.order, "recent"
+    assert_equal ratings_array, get_ratings(@community.id)
+  end
+
+  should "get the ratings of a community ordered by best ratings" do
+    ratings_array = []
+    @organization_ratings_config = "best"
+    @environment.save
+
+    first_rating = OrganizationRating.new
+    first_rating.organization = @community
+    first_rating.person = @person
+    first_rating.value = 3
+    first_rating.save
+
+    second_rating = OrganizationRating.new
+    second_rating.organization = @community
+    second_rating.person = @person
+    second_rating.value = 5
+    sleep 2
+    second_rating.save
+
+    ratings_array << second_rating
+    ratings_array << first_rating
+
+    assert_equal ratings_array, get_ratings(@community.id)
+  end
+end
@@ -0,0 +1,25 @@
+<div class="organization-average-rating-container">
+  <% if average_rating %>
+    <div class="star-rate-text">
+      <%= _("Rating: ") %>
+    </div>
+
+    <div class="star-container">
+      <% (1..5).each do |star_number| %>
+        <% if star_number <= average_rating %>
+          <div class="medium-star-positive"></div>
+        <% else %>
+          <div class="medium-star-negative"></div>
+        <% end %>
+      <% end %>
+    </div>
+  <% else %>
+    <div class="rating-invitation">
+      <%= _("Be the first to rate!") %>
+    </div>
+  <% end %>
+
+  <div class="rate-this-organization">
+    <%= link_to _("Rate this %s" % profile.class.name), url_for(:controller => "organization_ratings_plugin_profile", :action => "new_rating", :profile=>profile_identifier) %>
+  </div>
+</div>
 \ No newline at end of file
@@ -0,0 +1,21 @@
+<div class="ratings-title">
+  <%= block_title(block.title) %>
+  <% if block.get_ratings(block.owner.id).empty? %>
+    <div class="ratings-list">
+      <%= render :partial => 'shared/make_report_block' %>
+    </div>
+  <% else %>
+    <div class="ratings-list">
+      <% block.get_ratings(block.owner.id).each_with_index do |r, index| %>
+        <% break if index >= block.limit_number_of_ratings %>
+        <%= render :partial => "shared/user_rating_container", :locals => {:user_rate => r} %>
+      <% end %>
+
+      <%= render :partial => 'shared/make_report_block' %>
+
+      <div class="see-more">
+        <%= link_to _('See more'), url_for(:controller => 'organization_ratings_plugin_profile', :action => 'new_rating'), :class => 'icon-arrow-right-p' %>
+      </div>
+    </div>
+  <% end %>
+</div>
@@ -0,0 +1,54 @@
+<% config = env_organization_ratings_config %>
+
+<h1><%= _("Organization Rating Management") %> </h1>
+
+<%= labelled_form_for(:organization_ratings_config, :url => {:action => 'update'}) do |f| %>
+  <%= labelled_fields_for(:organization_ratings_config, config) do |c| %>
+    <table>
+      <tr>
+        <th><%= c_('Configuration') %></th>
+        <th><%= _('Value') %></th>
+      </tr>
+      <tr>
+        <td><%= _('Default amount of stars marked on evaluations') %></td>
+        <td><%= c.select :default_rating, (config.minimum_ratings)..5 %></td>
+      </tr>
+      <tr>
+        <td><%= _('Can rate an organization only once') %></td>
+        <td><%= c.check_box :vote_once %></td>
+      </tr>
+      <tr>
+        <td><%= _('The comments are moderated') %></td>
+        <td><%= c.check_box :are_moderated %></td>
+      </tr>
+      <tr>
+        <td>
+          <%= _('Time in hours between evaluations from the same user.') %>
+          <span class="hint" title=" <%= _('To disable cooldown use zero (0) value.') %> ">(?)</span>
+        </td>
+        <% hours_options = {size: 2} %>
+        <% hours_options[:disabled] = "disabled" if config.vote_once %>
+        <td><%= c.text_field :cooldown, hours_options %>
+        </td>
+      </tr>
+      <tr>
+        <td><%= _('Order ratings by') %></td>
+        <% order_options = [] %>
+        <% config.order_options.select{|k,v| order_options << v } %>
+        <td><%= c.select :order, order_options %></td>
+      </tr>
+      <tr>
+        <td><%= _('Ratings per page') %></td>
+        <td>
+          <%= c.select :per_page, 5..20 %>
+          </td>
+      </tr>
+    </table>
+    <div>
+      <% button_bar do %>
+        <%= submit_button('save', c_('Save changes')) %>
+        <%= button :back, _('Back'), :controller => 'plugins' %>
+      <% end %>
+    </div>
+  <% end %>
+<% end %>
@@ -0,0 +1,80 @@
+<% min_rate = env_organization_ratings_config.minimum_ratings %>
+<% default_rating = env_organization_ratings_config.default_rating %>
+
+<div class="star-page-title">
+  <%= @plugins.dispatch(:organization_ratings_title).collect { |content| instance_exec(&content) }.join("") %>
+</div>
+
+<div class="star-rate-data">
+
+  <div class="star-profile-information">
+    <div class="star-profile-image">
+      <%= profile_image(current_user.person, :portrait) %>
+    </div>
+
+    <div class="star-profile-name">
+      <%= current_user.name %>
+    </div>
+  </div>
+
+  <% if @rating_available %>
+    <div class="star-rate-form">
+      <div data-rate-url=<%= url_for controller: "organization_ratings_plugin_profile", :action => "rate" %>>
+        <div class="star-rate-text">
+          <%= @plugins.dispatch(:organization_ratings_plugin_star_message).collect { |content| instance_exec(&content) }.join("") %>
+        </div>
+
+        <div class="star-container" data-min-rate="<%= min_rate %>">
+
+          <% (1..5).each do |rate_number| %>
+            <% if rate_number <= default_rating %>
+              <div class="star-positive" data-star-rate="<%= rate_number %>"></div>
+            <% else %>
+              <div class="star-negative" data-star-rate="<%= rate_number %>"></div>
+            <% end %>
+          <% end %>
+        </div>
+
+        <div class="star-notice star-hide">
+          <%= _("Rated as") %> <span></span> <%= _("stars") %>
+        </div>
+      </div>
+
+      <div class="star-comment-container">
+        <%= form_for :comments do |c| %>
+          <div class="formfieldline formfield type-text">
+              <%= c.label :body, _('Comment (Optional):'), :class => "formlabel" %>
+              <%= c.text_area :body %>
+          </div>
+
+          <%= @plugins.dispatch(:organization_ratings_plugin_comments_extra_fields).collect { |content| instance_exec(&content) }.join("") %>
+
+          <div class="button-bar">
+            <%= submit_button(:save, _('Save'), :cancel => {controller: 'profile', action: 'index'}) %>
+          </div>
+
+          <input type="hidden" id="selected-star-rate" name="organization_rating_value" value="<%=  @default_rate %>">
+          <input type="hidden" id="minimum_stars" name="organization_rating_min_value" value="<%= min_rate %>">
+        <% end %>
+      </div>
+
+    <% elsif env_organization_ratings_config.vote_once %>
+      <div class="star-rate-form rating-vote-once">
+        <%= _("Hi, %s! The administrators set that you can vote") % current_user.name %>
+        <strong><%= _("only once") %></strong>
+        <%= _("for this %s.") % profile.class.name.downcase %>
+        <%= render :partial => 'shared/rating_button', :locals => { :disabled => true } %>
+      </div>
+    <% else %>
+      <div class="star-rate-form rating-cooldown">
+        <%= _("Hi, %s! The administrators set the minimum time of") % current_user.name %>
+        <strong><%= _("%s hour(s)" % env_organization_ratings_config.cooldown) %></strong>
+        <%= _("between each evaluation.") %>
+
+        <%= render :partial => 'shared/rating_button', :locals => { :disabled => true } %>
+      </div>
+    <% end %>
+
+
+  </div>
+</div>
 \ No newline at end of file
@@ -0,0 +1,18 @@
+<% config = env_organization_ratings_config %>
+<% if logged_in? %>
+  <%= render :partial => "new_rating_fields" %>
+<% else %>
+  <div class="ratings-list">
+    <%= render :partial => "shared/make_report_block" %>
+  </div>
+<% end %>
+
+<div class="ratings-list">
+  <% @users_ratings.each do |user_rate| %>
+    <%= render :partial => "shared/user_rating_container", :locals => {:user_rate => user_rate} %>
+  <% end %>
+</div>
+
+<div id='pagination-profiles'>
+  <%= pagination_links @users_ratings, :param_name => 'npage' %>
+</div>
 \ No newline at end of file
@@ -0,0 +1,28 @@
+<% logged_in_image = profile_image(current_user.person, :portrait) if current_user %>
+<% logged_out_image = image_tag('plugins/organization_ratings/public/images/user-not-logged.png') %>
+
+<div class="make-report-block">
+  <div class="star-profile-information">
+    <div class="star-profile-image">
+      <%= logged_in? ?  logged_in_image : logged_out_image %>
+    </div>
+
+    <div class="star-profile-name">
+      <%= logged_in? ? current_user.person.name : _('User not logged *') %>
+    </div>
+  </div>
+
+  <div class="make-report-container">
+    <div class="make-report-message">
+      <%= _('Report your experiences.') %>
+    </div>
+
+    <%= render :partial => 'shared/rating_button', :locals => { :disabled => false } %>
+
+    <% unless logged_in? %>
+      <div class="alert">
+        <%= _('* You must be logged in to submit a report.') %>
+      </div>
+    <% end %>
+  </div>
+</div>
 \ No newline at end of file
@@ -0,0 +1,10 @@
+<% button_bar do %>
+  <% if logged_in? %>
+    <%= button(:new,_("Rate %s ") % profile.class.name,
+              {:controller => "organization_ratings_plugin_profile",
+               :action => "new_rating"}) %>
+  <% else %>
+     <%= button(:login,_("Log in") , {:controller => 'account',
+                                      :action => 'login'}) %>
+  <% end %>
+<% end %>
@@ -0,0 +1,33 @@
+<div class="user-rating-block">
+  <div class="star-profile-information">
+    <div class="star-profile-image">
+      <%= profile_image(user_rate.person, :portrait) %>
+    </div>
+
+    <div class="star-profile-name">
+      <%= user_rate.person.name %>
+    </div>
+  </div>
+
+  <div class="user-testimony-container">
+    <div class="testimony-rate-date">
+      <%= time_ago_in_words(user_rate.created_at) %>
+    </div>
+
+    <div class="star-container">
+      <% (1..5).each do |rate_number| %>
+        <% if rate_number <=  user_rate.value %>
+          <div class="small-star-positive"></div>
+        <% else %>
+          <div class="small-star-negative"></div>
+        <% end %>
+      <% end %>
+    </div>
+
+    <div class="user-testimony">
+      <%= user_rate.comment.nil? ? _("No comment") : user_rate.comment.body %>
+    </div>
+
+    <%= @plugins.dispatch(:organization_ratings_plugin_extra_fields_show_data, user_rate).collect { |content| instance_exec(&content) }.join("") %>
+  </div>
+</div>
@@ -0,0 +1,4 @@
+<div class="organization-rating-comment-body">
+  <%= _("Comment:")%>
+  <%= "\"#{task.body}\""%>
+</div>
@@ -1,20 +0,0 @@
-class PeopleBlockPluginProfileController < ProfileController
-
-  append_view_path File.join(File.dirname(__FILE__) + '/../views')
-
-  def members
-    if is_cache_expired?(profile.members_cache_key(params))
-      unless params[:role_key].blank?
-        role = Role.find_by_key_and_environment_id(params[:role_key], profile.environment)
-        @members = profile.members.with_role(role.id)
-        @members_title = role.name
-      else
-        @members = profile.members
-        @members_title = 'members'
-      end
-      @members = @members.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage], :total_entries => @members.count)
-    end
-    render "profile/members"
-  end
-
-end
@@ -1,72 +0,0 @@
-require_relative '../test_helper'
-require_relative '../../controllers/people_block_plugin_profile_controller'
-
-class PeopleBlockPluginProfileControllerTest < ActionController::TestCase
-
-  def setup
-    @controller = PeopleBlockPluginProfileController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-
-    @profile = fast_create(Community)
-
-    @environment = @profile.environment
-    @environment.enabled_plugins = ['PeopleBlockPlugin']
-    @environment.save!
-
-    MembersBlock.delete_all
-    @block = MembersBlock.new
-    @block.box = @profile.boxes.first
-    @block.save!
-
-    @admin = create_user('adminprofile').person
-    @member = create_user('memberprofile').person
-    @moderator = create_user('moderatorprofile').person
-    @profile.add_moderator(@moderator)
-    @profile.add_member(@member)
-    @profile.add_admin(@admin)
-  end
-
-  attr_accessor :profile, :block, :admin, :member, :moderator
-
-  should 'list members without role_key' do
-    get :members, :profile => profile.identifier, :role_key => ""
-    assert_response :success
-    assert_template 'members'
-    assert_equivalent [@admin, @member, @moderator], assigns(:members)
-    assert_match /adminprofile/, @response.body
-    assert_match /memberprofile/, @response.body
-    assert_match /moderatorprofile/, @response.body
-  end
-
-  should 'list members with role_key=nil' do
-    get :members, :profile => profile.identifier, :role_key => nil
-    assert_response :success
-    assert_template 'members'
-    assert_equivalent [@admin, @member, @moderator], assigns(:members)
-    assert_match /adminprofile/, @response.body
-    assert_match /memberprofile/, @response.body
-    assert_match /moderatorprofile/, @response.body
-  end
-
-  should 'list members only' do
-    get :members, :profile => profile.identifier, :role_key => Profile::Roles.member(profile.environment.id).key
-    assert_response :success
-    assert_template 'members'
-    assert_equal [@member], assigns(:members)
-    assert_no_match /adminprofile/, @response.body
-    assert_match /memberprofile/, @response.body
-    assert_no_match /moderatorprofile/, @response.body
-  end
-
-  should 'list moderators only' do
-    get :members, :profile => profile.identifier, :role_key => Profile::Roles.moderator(profile.environment.id).key
-    assert_response :success
-    assert_template 'members'
-    assert_equal [@moderator], assigns(:members)
-    assert_no_match /adminprofile/, @response.body
-    assert_no_match /memberprofile/, @response.body
-    assert_match /moderatorprofile/, @response.body
-  end
-
-end
@@ -147,11 +147,11 @@ class MembersBlockTest &lt; ActionView::TestCase
  
     instance_eval(&block.footer)
     assert_select 'a.view-all' do |elements|
-      assert_select '[href=/profile/mytestuser/plugin/people_block/members]'
+      assert_select "[href=/profile/mytestuser/members#members-tab]"
     end
   end
  
-  should 'provide link to members page with a selected role' do
+  should 'provide link to members page when visible_role is profile_member' do
     profile = create_user('mytestuser').person
     block = MembersBlock.new
     block.box = profile.boxes.first
@@ -160,7 +160,33 @@ class MembersBlockTest &lt; ActionView::TestCase
  
     instance_eval(&block.footer)
     assert_select 'a.view-all' do |elements|
-      assert_select '[href=/profile/mytestuser/plugin/people_block/members?role_key=profile_member]'
+      assert_select '[href=/profile/mytestuser/members#members-tab]'
+    end
+  end
+
+  should 'provide link to members page when visible_role is profile_moderator' do
+    profile = create_user('mytestuser').person
+    block = MembersBlock.new
+    block.box = profile.boxes.first
+    block.visible_role = 'profile_moderator'
+    block.save!
+
+    instance_eval(&block.footer)
+    assert_select 'a.view-all' do |elements|
+      assert_select '[href=/profile/mytestuser/members#members-tab]'
+    end
+  end
+
+  should 'provide link to admins page when visible_role is profile_admin' do
+    profile = create_user('mytestuser').person
+    block = MembersBlock.new
+    block.box = profile.boxes.first
+    block.visible_role = 'profile_admin'
+    block.save!
+
+    instance_eval(&block.footer)
+    assert_select 'a.view-all' do |elements|
+      assert_select '[href=/profile/mytestuser/members#admins-tab]'
     end
   end
  
-<%= link_to c_('View all'), {:profile => profile.identifier, :controller => 'people_block_plugin_profile', :action => 'members', :role_key => role_key}, :class => 'view-all' %>
+<% anchor = role_key == "profile_admin" ? "admins-tab" : "members-tab" %>
+<%= link_to c_('View all'), {:profile => profile.identifier, :controller => 'profile', :action => 'members', :anchor =>anchor }, :class => 'view-all' %>
  
 <% if show_join_leave_button %>
   <%= render :partial => 'blocks/profile_info_actions/join_leave_community' %>
@@ -128,11 +128,12 @@ class StatisticsBlock &lt; Block
     end
   end
  
+  include Noosfero::Plugin::HotSpot
   def comments
     if owner.kind_of?(Environment) then
-      owner.profiles.joins(:articles).sum(:comments_count).to_i
+      owner.articles.sum(:comments_count).to_i + plugins.dispatch(:more_comments_count, owner).first.to_i
     elsif owner.kind_of?(Profile) then
-      owner.articles.sum(:comments_count)
+      owner.articles.sum(:comments_count) + plugins.dispatch(:more_comments_count, owner).first.to_i
     else
       0
     end
@@ -231,6 +231,10 @@ body, th, td, input {
   border-left: 0px;
 }
  
+.menu-submenu-list>li{
+  width: 100%;
+}
+
 #navigation .menu-submenu ul{
   border: 1px solid #888a85;
   border-top: 0px;
@@ -1534,3 +1538,7 @@ table#recaptcha_table tr:hover td {
   width: 494px;
   padding-left: 2px;
 }
+
+.profile-members-title-sort {
+  clear: both;
+}
@@ -0,0 +1,24 @@
+(function($) {
+  "use strict";
+
+  function set_members_sort() {
+    var profile_members_url = $("#profile_url").val();
+
+    $("#sort-members, #sort-admins").on("change", function() {
+      var sort_value = this.value;
+      var role = this.id;
+      role = role.replace("sort-", '');
+      var actual_page_content = $(".profile-list-"+role);
+
+      $.get(profile_members_url, {sort: sort_value}, function(response) {
+        var html_response = $(response);
+
+        actual_page_content.html(html_response.find(".profile-list-"+role).html());
+      });
+    });
+  }
+
+  $(document).ready(function() {
+    set_members_sort();
+  });
+}) (jQuery);
@@ -4775,6 +4775,11 @@ h1#agenda-title {
   background-image: url(../images/control-panel/role-management.gif)
 }
 /* ==> public/stylesheets/controller_profile_members.css <== */
+
+.profile-members-tabs-container .ui-corner-all {
+  overflow: auto;
+}
+
 .controller-profile_members .no-boxes {
   margin: 30px
 }
@@ -5430,6 +5435,7 @@ h1#agenda-title {
   margin: 0;
   padding: 0;
   width: 100%;
+  height: 92px;
 }
 #content .menu-submenu-content ul {
   margin: 0;
@@ -161,6 +161,10 @@ s/Marcos da Silva Ramos &lt;ms.ramos@outlook.com&gt;/Marcos Ramos &lt;ms.ramos@outlook.co
 s/Marcos Ramos <ms.ramos@outlook.com$/Marcos Ramos <ms.ramos@outlook.com>/
 s/Marcos <marcos.rpj2@gmail.com>/Marcos Ronaldo <marcos.rpj2@gmail.com>/
  
+s/Michel Felipe <mfelipeof@gmail.com>/Michel Felipe de Oliveira Ferreira <michel.ferreira@serpro.gov.br>/
+
+s/Omar Júnior/Omar Junior/
+
 s/Parley Martins <parley@outlook.com>/Parley Martins <parleypachecomartins@gmail.com>/
  
 s/Paulo Meirelles$/Paulo Meirelles <paulo@softwarelivre.org>/
@@ -180,6 +184,8 @@ s/Pedro Leal &lt;carlos88morais@gmail.com&gt;/Pedro Leal/
 s/Pedro Leal <diegoamc90@gmail.com>/Pedro Leal/
 s/Pedro Leal <jaodsilv@linux.ime.usp.br>/Pedro Leal/
  
+s/^pedrodelyra/Pedro de Lyra/
+
 s/Rafael Manzo$/Rafael Reggiani Manzo <rr.manzo@gmail.com>/
 s/Rafael Manzo <alessandro.palmeira@gmail.com>/Rafael Reggiani Manzo <rr.manzo@gmail.com>/
 s/Rafael Manzo <caio.csalgado@gmail.com>/Rafael Reggiani Manzo <rr.manzo@gmail.com>/
@@ -214,6 +220,10 @@ s/Valéssio Brito &lt;contato@valessiobrito.com.br&gt;/Valessio Brito &lt;contato@valessi
 s/Valessio Brito <contato@valessiobrito.info>/Valessio Brito <contato@valessiobrito.com.br>/
 s/Valessio Brito <valessio@gmail.com>/Valessio Brito <contato@valessiobrito.com.br>/
 /Visita <visita@debian.(none)>/d
+
+s/Vítor Barbosa/Vitor Barbosa/
+s/vitormga15@gmail.com/vitornga15@gmail.com/
+
 s/vfcosta <vfcosta@gmail.com>/Victor Costa <vfcosta@gmail.com>/
 s/Victor Carvalho <victorhugodf.ac@gmail.com>/Victor Hugo Alves de Carvalho <victorhugodf.ac@gmail.com>/
  
-binary_packages='deb http://download.noosfero.org/debian/wheezy-1.2 ./'
+binary_packages='deb http://download.noosfero.org/debian/wheezy-1.3 ./'
  
 source_packages=$(echo "$binary_packages" | sed -e 's/^deb/deb-src/')
  
@@ -188,6 +188,16 @@ class ApplicationControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'option', :attributes => { :value => 'it' }, :content => 'Italiano'
   end
  
+  should 'set and unset the current user' do
+    testuser = create_user 'testuser'
+    login_as 'testuser'
+    User.expects(:current=).with do |user|
+      user == testuser
+    end.at_least_once
+    User.expects(:current=).with(nil).at_least_once
+    get :index
+  end
+
   should 'display link to webmail if enabled for system' do
     @controller.stubs(:get_layout).returns('application')
     login_as('ze')
@@ -557,8 +557,17 @@ class CmsControllerTest &lt; ActionController::TestCase
   end
  
   should 'keep informed parent_id' do
+    fast_create(:blog, :name=>"Sample blog", :profile_id=>@profile.id)
+
+    profile.home_page = profile.blogs.find_by_name "Sample blog"
+    profile.save!
+
     get :new, :profile => @profile.identifier, :parent_id => profile.home_page.id, :type => 'TextileArticle'
-    assert_tag :tag => 'input', :attributes => { :name => 'parent_id', :value => profile.home_page.id }
+    assert_tag :tag => 'select',
+               :attributes => { :id => 'article_parent_id' },
+               :child => {
+                  :tag => "option", :attributes => {:value => profile.home_page.id, :selected => "selected"}
+               }
   end
  
   should 'list folders before others' do
@@ -1836,14 +1845,6 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_equal 'first version', assigns(:article).name
   end
  
-  should 'clone article with its content' do
-    article = profile.articles.create(:name => 'first version')
-
-    get :new, :profile => profile.identifier, :id => article.id, :clone => true, :type => 'TinyMceArticle'
-
-    assert_match article.name, @response.body
-  end
-
   should 'save article with content from older version' do
     article = profile.articles.create(:name => 'first version')
     article.name = 'second version'; article.save
@@ -1894,6 +1895,33 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_equal '[{"label":"linux","value":"linux"}]', @response.body
   end
  
+  should 'clone an article with its parent' do
+    login_as(profile.identifier)
+
+    f = Folder.new(:name => 'f')
+    profile.articles << f
+    f.save!
+
+    post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :parent_id => f.id,
+               :article => { :name => 'Main Article', :body => 'some content' }
+
+    main_article = profile.articles.find_by_name('Main Article')
+    assert_not_nil main_article
+
+    post :new, :type => 'TinyMceArticle', :profile => profile.identifier, :parent_id => f.id,
+               :id => main_article.id, :clone => true
+
+    cloned_main_article = profile.articles.find_by_name('Main Article')
+    assert_not_nil cloned_main_article
+
+    assert_equal main_article.parent_id, cloned_main_article.parent_id
+
+    get :new, :profile => profile.identifier, :id => cloned_main_article.id,
+              :clone => true, :type => 'TinyMceArticle'
+
+    assert_match main_article.body, @response.body
+  end
+
   protected
  
   # FIXME this is to avoid adding an extra dependency for a proper JSON parser.
@@ -1584,4 +1584,33 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'div', :attributes => { :class => 'article-compact-image' }
     assert_tag :tag => 'div', :attributes => { :class => 'article-compact-abstract-with-image' }
   end
+
+  should 'not count a visit twice for the same user' do
+    profile = create_user('someone').person
+    login_as(@profile.identifier)
+    page = profile.articles.build(:name => 'myarticle', :body => 'the body of the text')
+    page.save!
+
+    get :view_page, :profile => profile.identifier, :page => 'myarticle'
+    page.reload
+    assert_equal 1, page.hits
+
+    get :view_page, :profile => profile.identifier, :page => 'myarticle'
+    page.reload
+    assert_equal 1, page.hits
+  end
+
+  should 'not count a visit twice for unlogged users' do
+     profile = create_user('someone').person
+     page = profile.articles.build(:name => 'myarticle', :body => 'the body of the text')
+     page.save!
+
+     get :view_page, :profile => profile.identifier, :page => 'myarticle'
+     page.reload
+     assert_equal 1, page.hits
+
+     get :view_page, :profile => profile.identifier, :page => 'myarticle'
+     page.reload
+     assert_equal 1, page.hits
+  end
 end
@@ -52,7 +52,8 @@ class ProfileControllerTest &lt; ActionController::TestCase
  
     assert_response :success
     assert_template 'members'
-    assert assigns(:members)
+    assert assigns(:profile_members)
+    assert assigns(:profile_admins)
   end
  
   should 'list favorite enterprises' do
@@ -940,7 +941,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     @controller.stubs(:current_user).returns(user)
     Person.any_instance.stubs(:follows?).returns(true)
     get :index, :profile => p1.identifier
-    assert_equal [s3,s2], assigns(:activities).map(&:activity)
+    assert_equal [s3,s2], assigns(:activities).map(&:activity).select {|a| a.kind_of?(Scrap)}
   end
  
   should 'the activities be the received scraps in community profile' do
@@ -1746,4 +1747,68 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_no_tag :tag => 'td', :descendant => { :tag => 'a', :content => /#{person.enterprises.count}/, :attributes => { :href => /profile\/#{person.identifier}\/enterprises$/ }}
   end
  
+  should 'admins from a community be present in admin users div and members div' do
+    community = fast_create(Community)
+    another_user = create_user('another_user').person
+
+    login_as(@profile.identifier)
+
+    community.add_admin(@profile)
+
+    assert community.admins.include? @profile
+    get :members, :profile => community.identifier
+
+    assert_tag :tag => 'ul', :attributes => { :class => /profile-list-admins/},
+      :descendant => { :tag => 'a', :attributes => { :title => "testuser" } }
+
+    assert_tag :tag => 'ul', :attributes => { :class => /profile-list-members/},
+      :descendant => { :tag => 'a', :attributes => { :title => "testuser" } }
+  end
+
+  should 'all members, except admins, be present in members div' do
+    community = fast_create(Community)
+    community.add_member(@profile)
+
+    another_user = create_user('another_user').person
+    community.add_member(another_user)
+
+    assert_equal false, community.admins.include?(another_user)
+
+    get :members, :profile => community.identifier
+
+    assert_tag :tag => 'ul', :attributes => { :class => /profile-list-members/},
+      :descendant => { :tag => 'a', :attributes => { :title => "another_user" } }
+
+    assert_no_tag :tag => 'ul', :attributes => { :class => /profile-list-admins/},
+    :descendant => { :tag => 'a', :attributes => { :title => "another_user" } }
+  end
+
+  should 'members be sorted by name in ascendant order' do
+    community = fast_create(Community)
+    another_user = create_user('another_user').person
+    different_user = create_user('different_user').person
+
+    community.add_member(@profile)
+    community.add_member(another_user)
+    community.add_member(different_user)
+
+    get :members, :profile => community.identifier, :sort => "asc"
+
+    assert @response.body.index("another_user") < @response.body.index("different_user")
+  end
+
+  should 'members be sorted by name in descendant order' do
+    community = fast_create(Community)
+    another_user = create_user('another_user').person
+    different_user = create_user('different_user').person
+
+    community.add_member(@profile)
+    community.add_member(another_user)
+    community.add_member(different_user)
+
+    get :members, :profile => community.identifier, :sort => "desc"
+
+    assert @response.body.index("another_user") > @response.body.index("different_user")
+  end
+
 end
@@ -0,0 +1,21 @@
+require_relative "../test_helper"
+
+class CloneArticleTest < ActiveSupport::TestCase
+
+  should 'cloned article have its source attributes' do
+    community = fast_create(Community)
+    folder = fast_create(Folder, :profile_id => community.id)
+    article = fast_create(TinyMceArticle, :profile_id => community.id)
+    article.parent_id = folder.id
+    article.save!
+
+    article.reload
+    cloned_article = article.copy_without_save({:parent_id => article.parent_id})
+
+    assert_equal folder.id, cloned_article.parent_id
+    assert_equal article.body , cloned_article.body
+    assert_equal article.name, cloned_article.name
+    assert_equal article.setting, cloned_article.setting
+  end
+
+end
 \ No newline at end of file
@@ -6,6 +6,7 @@ class ScrapTest &lt; ActiveSupport::TestCase
     Person.destroy_all
     Scrap.destroy_all
     ActionTracker::Record.destroy_all
+    Delayed::Job.destroy_all
   end
  
   should "have the content" do
...	...	@@ -90,15 +90,17 @@ Matheus Faria <matheus.sousa.faria@gmail.com>
90	90	Maurilio Atila <cabelotaina@gmail.com>
91	91	M for Momo <mo@rtnp.org>
92	92	Michal Čihař <michal@cihar.com>
93		-Michel Felipe <mfelipeof@gmail.com>
	93	+Michel Felipe de Oliveira Ferreira <michel.ferreira@serpro.gov.br>
94	94	Moises Machado <moises@colivre.coop.br>
95	95	Naíla Alves <naila@colivre.coop.br>
96	96	Nanda Lopes <nanda.listas+psl@gmail.com>
97	97	Niemand Jedermann <predatorix@web.de>
	98	+Omar Junior <omarroinuj@gmail.com>
98	99	Parley Martins <parleypachecomartins@gmail.com>
99	100	Paulo Meirelles <paulo@softwarelivre.org>
100	101	Pedro de Lyra <pedrodelyra@gmail.com>
101	102	Pedro Leal
	103	+Phillip Rohmberger <rohmberger@hotmail.de>
102	104	Rafael de Souza Queiroz <querafael@live.com>
103	105	Rafael Gomes <rafaelgomes@techfree.com.br>
104	106	Rafael Martins <rmmartins@gmail.com>
...	...	@@ -112,6 +114,7 @@ Rodrigo Medeiros <rodrigo.mss01@gmail.com>
112	114	Rodrigo Souto <rodrigo@colivre.coop.br>
113	115	Ronny Kursawe <kursawe.ronny@googlemail.com>
114	116	Samuel R. C. Vale <srcvale@holoscopio.com>
	117	+Simiao Carvalho <simiaosimis@gmail.com>
115	118	Tallys Martins <tallysmartins@yahoo.com.br>
116	119	Thiago Casotti <thiago.casotti@uol.com.br>
117	120	Thiago Kairala <thiagor.kairala@gmail.com>
...	...	@@ -123,6 +126,7 @@ Valessio Brito <contato@valessiobrito.com.br>
123	126	Victor Costa <vfcosta@gmail.com>
124	127	Victor Hugo Alves de Carvalho <victorhugodf.ac@gmail.com>
125	128	Vinicius Cubas Brand <viniciuscb@gmail.com>
	129	+Vitor Barbosa <vitornga15@gmail.com>
126	130	Wilton Rodrigues <braynwilton@gmail.com>
127	131	Yann Lugrin <yann.lugrin@liquid-concept.ch>
128	132
...	...
...	...	@@ -111,10 +111,7 @@ class CmsController < MyProfileController
111	111	end
112	112	end
113	113
114		- unless @article.kind_of?(RssFeed)
115		- @escaped_body = CGI::escapeHTML(@article.body \|\| '')
116		- @escaped_abstract = CGI::escapeHTML(@article.abstract \|\| '')
117		- end
	114	+ escape_fields @article
118	115	end
119	116
120	117	def new
...	...	@@ -185,6 +182,8 @@ class CmsController < MyProfileController
185	182	end
186	183	end
187	184
	185	+ escape_fields @article
	186	+
188	187	render :action => 'edit'
189	188	end
190	189
...	...	@@ -534,4 +533,10 @@ class CmsController < MyProfileController
534	533	end
535	534	end
536	535
	536	+ def escape_fields article
	537	+ unless article.kind_of?(RssFeed)
	538	+ @escaped_body = CGI::escapeHTML(article.body \|\| '')
	539	+ @escaped_abstract = CGI::escapeHTML(article.abstract \|\| '')
	540	+ end
	541	+ end
537	542	end
...	...
...	...	@@ -8,6 +8,7 @@ class ContentViewerController < ApplicationController
8	8	helper TagsHelper
9	9
10	10	def view_page
	11	+
11	12	path = get_path(params[:page], params[:format])
12	13
13	14	@version = params[:version].to_i
...	...	@@ -38,7 +39,7 @@ class ContentViewerController < ApplicationController
38	39	end
39	40
40	41	# At this point the page will be showed
41		- @page.hit unless user_is_a_bot?
	42	+ @page.hit unless user_is_a_bot? \|\| already_visited?(@page)
42	43
43	44	@page = FilePresenter.for @page
44	45
...	...	@@ -272,4 +273,18 @@ class ContentViewerController < ApplicationController
272	273	@comment_order = params[:comment_order].nil? ? 'oldest' : params[:comment_order]
273	274	end
274	275
	276	+ private
	277	+
	278	+ def already_visited?(element)
	279	+ user_id = if user.nil? then -1 else current_user.id end
	280	+ user_id = "#{user_id}_#{element.id}_#{element.class}"
	281	+
	282	+ if cookies.signed[:visited] == user_id
	283	+ return true
	284	+ else
	285	+ cookies.permanent.signed[:visited] = user_id
	286	+ return false
	287	+ end
	288	+ end
	289	+
275	290	end
...	...
...	...	@@ -66,7 +66,10 @@ class ProfileController < PublicController
66	66
67	67	def members
68	68	if is_cache_expired?(profile.members_cache_key(params))
69		- @members = profile.members_by_name.includes(relations_to_include).paginate(:per_page => members_per_page, :page => params[:npage], :total_entries => profile.members.count)
	69	+ sort = (params[:sort] == 'desc') ? params[:sort] : 'asc'
	70	+ @profile_admins = profile.admins.includes(relations_to_include).order("name #{sort}").paginate(:per_page => members_per_page, :page => params[:npage])
	71	+ @profile_members = profile.members.includes(relations_to_include).order("name #{sort}").paginate(:per_page => members_per_page, :page => params[:npage])
	72	+ @profile_members_url = url_for(:controller => 'profile', :action => 'members')
70	73	end
71	74	end
72	75
...	...
...	...	@@ -88,7 +88,7 @@ module ArticleHelper
88	88	content_tag( 'small', _('Who will be able to create new topics on this forum?')) +
89	89	content_tag('div', '', slider_options) +
90	90	hidden_field_tag('article[topic_creation]', article.topic_creation) +
91		- javascript_include_tag('topic-creation-config')
	91	+ javascript_include_tag("#{Noosfero.root}/assets/topic-creation-config.js")
92	92	end
93	93
94	94	def privacity_exceptions(article, tokenized_children)
...	...
...	...	@@ -920,7 +920,8 @@ private :generate_url, :url_options
920	920
921	921	def members_cache_key(params = {})
922	922	page = params[:npage] \|\| '1'
923		- cache_key + '-members-page-' + page
	923	+ sort = (params[:sort] == 'desc') ? params[:sort] : 'asc'
	924	+ cache_key + '-members-page-' + page + '-' + sort
924	925	end
925	926
926	927	def more_recent_label
...	...
...	...	@@ -16,6 +16,7 @@ class ProfileActivity < ActiveRecord::Base
16	16
17	17	def self.update_activity activity
18	18	profile_activity = ProfileActivity.where(activity_id: activity.id, activity_type: activity.class.base_class.name).first
	19	+ return unless profile_activity
19	20	profile_activity.send :copy_timestamps
20	21	profile_activity.save!
21	22	profile_activity
...	...
...	...	@@ -22,11 +22,11 @@ class Scrap < ActiveRecord::Base
22	22
23	23	scope :not_replies, ->{ where scrap_id: nil }
24	24
25		- track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{\|s\| s.sender != s.receiver && s.sender != s.top_root.receiver}, :custom_target => :action_tracker_target
	25	+ track_actions :leave_scrap, :after_create, :keep_params => ['sender.name', 'content', 'receiver.name', 'receiver.url'], :if => Proc.new{\|s\| s.sender != s.receiver && s.sender != s.top_root.receiver}, :custom_target => :action_tracker_target, :custom_user => :sender
26	26
27		- track_actions :leave_scrap_to_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{\|s\| s.sender == s.receiver}
	27	+ track_actions :leave_scrap_to_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{\|s\| s.sender == s.receiver}, :custom_user => :sender
28	28
29		- track_actions :reply_scrap_on_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{\|s\| s.sender != s.receiver && s.sender == s.top_root.receiver}
	29	+ track_actions :reply_scrap_on_self, :after_create, :keep_params => ['sender.name', 'content'], :if => Proc.new{\|s\| s.sender != s.receiver && s.sender == s.top_root.receiver}, :custom_user => :sender
30	30
31	31	after_create :send_notification
32	32
...	...
...	...	@@ -5,8 +5,6 @@
5	5
6	6	<%= hidden_field_tag("type", @type) if @type %>
7	7
8		- <%= hidden_field_tag('parent_id', @parent_id) if @parent_id %>
9		-
10	8	<%= hidden_field_tag('back_to', @back_to) %>
11	9
12	10	<%= hidden_field_tag('success_back_to', @success_back_to) %>
...	...
...	...	@@ -29,10 +29,10 @@
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.nil? ? nil : @page.parent)))) unless remove_content_button(:new, @page) %>
	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) %>
33	33
34	34	<% content = content_tag('span', label_for_clone_article(@page)) %>
35		- <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'new', :id => @page.id, :clone => true, :type => @page.class }) %>
	35	+ <% url = profile.admin_url.merge({ :controller => 'cms', :action => 'new', :id => @page.id, :clone => true, :parent_id => (@page.folder? ? @page : @page.parent), :type => @page.class}) %>
36	36	<%= expirable_button @page, :clone, content, url %>
37	37	<% end %>
38	38
...	...