Merge branch 'stable' into master

Conflicts: app/models/environment.rb features/publish_article.feature test/unit/application_helper_test.rb test/unit/blog_test.rb test/unit/environment_test.rb

Merge branch 'stable' into master
Conflicts: app/models/environment.rb features/publish_article.feature test/unit/application_helper_test.rb test/unit/blog_test.rb test/unit/environment_test.rb
Joenio Costa
2 parents 381cca8f 1a7d1285
Showing 44 changed files with 491 additions and 254 deletions Show diff stats
app/controllers/public/content_viewer_controller.rb
app/helpers/application_helper.rb
app/helpers/blog_helper.rb
app/models/article.rb
app/models/article_block.rb
app/models/blog.rb
app/models/change_password.rb
app/models/community.rb
app/models/create_community.rb
app/models/create_enterprise.rb
app/models/enterprise.rb
app/models/environment.rb
app/models/event.rb
app/models/organization.rb
app/models/uploaded_file.rb
app/views/account/forgot_password.rhtml
app/views/cms/edit.rhtml
app/views/content_viewer/blog_page.rhtml
app/views/content_viewer/view_page.rhtml
app/views/enterprise_registration/basic_information.rhtml
@@ -81,7 +81,13 @@ class ContentViewerController &lt; ApplicationController
     end
  
     if @page.blog?
-      @page.filter = {:year => params[:year], :month => params[:month]}
+      posts = if params[:year] and params[:month]
+        filter_date = DateTime.parse("#{params[:year]}-#{params[:month]}-01")
+        @page.posts.by_range(filter_date..Article.last_day_of_month(filter_date))
+      else
+        @page.posts
+      end
+      @posts = available_articles(posts, user).paginate :page => params[:npage], :per_page => @page.posts_per_page
     end
  
     if @page.folder? && @page.view_as == 'image_gallery'
@@ -11,7 +11,7 @@ module ApplicationHelper
   include BoxesHelper
  
   include FormsHelper
-  
+
   include AssetsHelper
  
   include BlockHelper
@@ -94,7 +94,7 @@ module ApplicationHelper
     if options[:type] == :textile
       content = RedCloth.new(content).to_html
     end
-    
+
     options[:class] = '' if ! options[:class]
     options[:class] += ' button icon-help' # with-text
  
@@ -269,7 +269,7 @@ module ApplicationHelper
     if klass.nil?
       raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?'
     end
-    
+
     name = klass.name.underscore
     if File.exists?(File.join(RAILS_ROOT, 'app', 'views', params[:controller], "_#{name}.rhtml"))
       name
@@ -285,7 +285,7 @@ module ApplicationHelper
   # DEPRECATED. Do not use this.
   def stylesheet_import(*sources)
     options = sources.last.is_a?(Hash) ? sources.pop : { }
-    themed_source = options.delete(:themed_source) 
+    themed_source = options.delete(:themed_source)
     content_tag(
       'style',
       "\n" +
@@ -299,7 +299,7 @@ module ApplicationHelper
       end.join(),
       { "type" => "text/css" }.merge(options)
     )
-  end 
+  end
  
   # DEPRECATED. Do not use this.
   def filename_for_stylesheet(name, in_theme)
@@ -391,7 +391,7 @@ module ApplicationHelper
     Theme.find(current_theme).owner.identifier
   end
  
-  # generates a image tag for the profile. 
+  # generates a image tag for the profile.
   #
   # If the profile has no image set yet, then a default image is used.
   def profile_image(profile, size=:portrait, opt={})
@@ -787,8 +787,9 @@ module ApplicationHelper
       field_html ||= ''
       field_html += capture(&block)
     end
-    if (controller.action_name == 'signup')
-      if profile.signup_fields.include?(name) || profile.required_fields.include?(name)
+
+    if controller.action_name == 'signup' || controller.action_name == 'new_community' || (controller.controller_name == "enterprise_registration" && controller.action_name == 'index')
+      if profile.signup_fields.include?(name)
         result = field_html
       end
     else
@@ -796,6 +797,7 @@ module ApplicationHelper
         result = field_html
       end
     end
+
     if is_required
       result = required(result)
     end
@@ -943,8 +945,9 @@ module ApplicationHelper
     content_for(:head) { stylesheet_link_tag(*args) }
   end
  
-  def article_to_html(article)
-    content = article.to_html(:page => params[:npage])
+  def article_to_html(article, options = {})
+    options.merge(:page => params[:npage])
+    content = article.to_html(options)
     return self.instance_eval(&content) if content.kind_of?(Proc)
     content
   end
@@ -14,7 +14,7 @@ module BlogHelper
     _('Edit blog')
   end
  
-  def list_posts(user, articles, format = 'full')
+  def list_posts(articles, format = 'full')
     pagination = will_paginate(articles, {
       :param_name => 'npage',
       :prev_label => _('&laquo; Newer posts'),
@@ -25,18 +25,16 @@ module BlogHelper
     articles.each_with_index{ |art,i|
       css_add = [ 'position-'+(i+1).to_s() ]
       position = (i%2 == 0) ? 'odd-post' : 'even-post'
-      if art.published? || (user==art.profile)
-        css_add << 'first' if i == 0
-        css_add << 'last'  if i == (artic_len-1)
-        css_add << 'not-published' if !art.published?
-        css_add << position + '-inner'
-        content << content_tag('div',
-                    content_tag('div',
-                       display_post(art, format) + '<br style="clear:both"/>',
-                       :class => 'blog-post ' + css_add.join(' '),
-                       :id => "post-#{art.id}"), :class => position
-                   )
-      end
+      css_add << 'first' if i == 0
+      css_add << 'last'  if i == (artic_len-1)
+      css_add << 'not-published' if !art.published?
+      css_add << position + '-inner'
+      content << content_tag('div',
+                             content_tag('div',
+                                         display_post(art, format) + '<br style="clear:both"/>',
+                                         :class => 'blog-post ' + css_add.join(' '),
+                                         :id => "post-#{art.id}"), :class => position
+                            )
     }
     content.join("\n<hr class='sep-posts'/>\n") + (pagination or '')
   end
@@ -32,6 +32,23 @@ class Article &lt; ActiveRecord::Base
     {:include => 'categories', :conditions => { 'categories.id' => category.id }}
   }
  
+  named_scope :by_range, lambda { |range| {
+    :conditions => [
+      'published_at BETWEEN :start_date AND :end_date', { :start_date => range.first, :end_date => range.last }
+    ]
+  }}
+
+  def self.first_day_of_month(date)
+    date ||= Date.today
+    Date.new(date.year, date.month, 1)
+  end
+
+  def self.last_day_of_month(date)
+    date ||= Date.today
+    date >>= 1
+    Date.new(date.year, date.month, 1) - 1.day
+  end
+
   URL_FORMAT = /\A(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?\Z/ix
  
   validates_format_of :external_link, :with => URL_FORMAT, :if => lambda { |article| !article.external_link.blank? }
@@ -12,7 +12,7 @@ class ArticleBlock &lt; Block
     block = self
     lambda do
       block_title(block.title) +
-      (block.article ? article_to_html(block.article) : _('Article not selected yet.'))
+      (block.article ? article_to_html(block.article, :gallery_view => false) : _('Article not selected yet.'))
     end
   end
  
@@ -3,7 +3,6 @@ class Blog &lt; Folder
   has_many :posts, :class_name => 'Article', :foreign_key => 'parent_id', :source => :children, :conditions => [ 'type != ?', 'RssFeed' ], :order => 'published_at DESC, id DESC'
  
   attr_accessor :feed_attrs
-  attr_accessor :filter
  
   after_create do |blog|
     blog.children << RssFeed.new(:name => 'feed', :profile => blog.profile)
@@ -23,7 +22,9 @@ class Blog &lt; Folder
   # FIXME isn't this too much including just to be able to generate some HTML?
   include ActionView::Helpers::TagHelper
   def to_html(options = {})
-    posts_list(options[:page])
+    lambda do
+      render :file => 'content_viewer/blog_page'
+    end
   end
  
   def folder?
@@ -49,19 +50,6 @@ class Blog &lt; Folder
     self.feed
   end
  
-  def posts_list(npage)
-    article = self
-    children = if filter and filter[:year] and filter[:month]
-                filter_date = DateTime.parse("#{filter[:year]}-#{filter[:month]}-01")
-                posts.paginate :page => npage, :per_page => posts_per_page, :conditions => [ 'published_at between ? and ?', filter_date, filter_date + 1.month - 1.day ]
-              else
-                posts.paginate :page => npage, :per_page => posts_per_page
-              end
-    lambda do
-      render :file => 'content_viewer/blog_page', :locals => {:article => article, :children => children}
-    end
-  end
-
   has_one :external_feed, :foreign_key => 'blog_id', :dependent => :destroy
  
   attr_accessor :external_feed_data
@@ -5,7 +5,7 @@ class ChangePassword &lt; Task
     self[:data] ||= {}
   end
  
-  attr_accessor :login, :email, :password, :password_confirmation
+  attr_accessor :login, :email, :password, :password_confirmation, :environment_id
  
   def self.human_attribute_name(attrib)
     case attrib.to_sym
@@ -25,15 +25,15 @@ class ChangePassword &lt; Task
   ###################################################
   # validations for creating a ChangePassword task 
  
-  validates_presence_of :login, :email, :on => :create
+  validates_presence_of :login, :email, :environment_id, :on => :create
  
   validates_presence_of :requestor_id
  
   validates_format_of :email, :on => :create, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda { |obj| !obj.email.blank? })
  
   validates_each :login, :on => :create do |data,attr,value|
-    unless data.login.blank?
-      user = User.find_by_login(data.login)
+    unless data.login.blank? || data.email.blank?
+      user = User.find_by_login_and_environment_id(data.login, data.environment_id)
       if user.nil? 
         data.errors.add(:login, _('%{fn} is not a valid username.'))
       else
@@ -23,10 +23,6 @@ class Community &lt; Organization
   xss_terminate :only => [ :name, :address, :contact_phone, :description ], :on => 'validation'
  
   FIELDS = %w[
-    city
-    state
-    country
-    zip_code
     language
   ]
  
@@ -38,7 +34,7 @@ class Community &lt; Organization
     super
     self.required_fields.each do |field|
       if self.send(field).blank?
-        self.errors.add(field, _('%{fn} is mandatory'))
+        self.errors.add(field, _('%{fn} can\'t be blank'))
       end
     end
   end
@@ -51,6 +47,10 @@ class Community &lt; Organization
     environment ? environment.required_community_fields : []
   end
  
+  def signup_fields
+    environment ? environment.signup_community_fields : []
+  end
+
   def name=(value)
     super(value)
     self.identifier = value.to_slug
@@ -14,7 +14,7 @@ class CreateCommunity &lt; Task
  
   acts_as_having_image
  
-  DATA_FIELDS = Community.fields + ['name', 'closed', 'tag_list']
+  DATA_FIELDS = Community.fields + ['name', 'closed']
  
   DATA_FIELDS.each do |field|
     # getter
@@ -30,7 +30,7 @@ class CreateCommunity &lt; Task
   def validate
     self.environment.required_community_fields.each do |field|
       if self.send(field).blank?
-        self.errors.add(field, _('%{fn} is mandatory'))
+        self.errors.add(field, _('%{fn} can\'t be blank'))
       end
     end
   end
@@ -106,6 +106,10 @@ class CreateEnterprise &lt; Task
     environment ? environment.required_enterprise_fields : []
   end
  
+  def signup_fields
+    environment ? environment.signup_enterprise_fields : []
+  end
+
   def community?
     false
   end
@@ -27,10 +27,6 @@ class Enterprise &lt; Organization
  
   FIELDS = %w[
     business_name
-    zip_code
-    city
-    state
-    country
     organization_website
     historic_and_current_context
     activities_short_description
@@ -59,6 +55,10 @@ class Enterprise &lt; Organization
     environment ? environment.required_enterprise_fields : []
   end
  
+  def signup_fields
+    environment ? environment.signup_enterprise_fields : []
+  end
+
   def product_categories
     products.map{|p| p.category_full_name}.compact
   end
@@ -304,14 +304,25 @@ class Environment &lt; ActiveRecord::Base
     if values['schooling'] && values['schooling']['active'] == 'true'
       schooling_status = values['schooling']
     end
+
     self.settings[:custom_person_fields] = values.delete_if { |key, value| ! Person.fields.include?(key)}
+    self.settings[:custom_person_fields].each_pair do |key, value|
+      if value['required'] == 'true'
+        self.settings[:custom_person_fields][key]['active'] = 'true'
+        self.settings[:custom_person_fields][key]['signup'] = 'true'
+      end
+      if value['signup'] == 'true'
+        self.settings[:custom_person_fields][key]['active'] = 'true'
+      end
+    end
+
     if schooling_status
       self.settings[:custom_person_fields]['schooling_status'] = schooling_status
     end
   end
  
   def custom_person_field(field, status)
-    if (custom_person_fields[field] && custom_person_fields[field][status] == 'true') 
+    if (custom_person_fields[field] && custom_person_fields[field][status] == 'true')
       return true
     end
     false
@@ -351,10 +362,19 @@ class Environment &lt; ActiveRecord::Base
  
   def custom_enterprise_fields=(values)
     self.settings[:custom_enterprise_fields] = values.delete_if { |key, value| ! Enterprise.fields.include?(key)}
+    self.settings[:custom_enterprise_fields].each_pair do |key, value|
+      if value['required'] == 'true'
+        self.settings[:custom_enterprise_fields][key]['active'] = 'true'
+        self.settings[:custom_enterprise_fields][key]['signup'] = 'true'
+      end
+      if value['signup'] == 'true'
+        self.settings[:custom_enterprise_fields][key]['active'] = 'true'
+      end
+    end
   end
  
   def custom_enterprise_field(field, status)
-    if (custom_enterprise_fields[field] && custom_enterprise_fields[field][status] == 'true') 
+    if (custom_enterprise_fields[field] && custom_enterprise_fields[field][status] == 'true')
       return true
     end
     false
@@ -372,16 +392,32 @@ class Environment &lt; ActiveRecord::Base
     required_fields
   end
  
+  def signup_enterprise_fields
+    signup_fields = []
+    active_enterprise_fields.each do |field|
+      signup_fields << field if custom_enterprise_fields[field]['signup'] == 'true'
+    end
+    signup_fields
+  end
+
   def custom_community_fields
     self.settings[:custom_community_fields].nil? ? {} : self.settings[:custom_community_fields]
   end
-
   def custom_community_fields=(values)
     self.settings[:custom_community_fields] = values.delete_if { |key, value| ! Community.fields.include?(key) }
+    self.settings[:custom_community_fields].each_pair do |key, value|
+      if value['required'] == 'true'
+        self.settings[:custom_community_fields][key]['active'] = 'true'
+        self.settings[:custom_community_fields][key]['signup'] = 'true'
+      end
+      if value['signup'] == 'true'
+        self.settings[:custom_community_fields][key]['active'] = 'true'
+      end
+    end
   end
  
   def custom_community_field(field, status)
-    if (custom_community_fields[field] && custom_community_fields[field][status] == 'true') 
+    if (custom_community_fields[field] && custom_community_fields[field][status] == 'true')
       return true
     end
     false
@@ -399,6 +435,14 @@ class Environment &lt; ActiveRecord::Base
     required_fields
   end
  
+  def signup_community_fields
+    signup_fields = []
+    active_community_fields.each do |field|
+      signup_fields << field if custom_community_fields[field]['signup'] == 'true'
+    end
+    signup_fields
+  end
+
   # #################################################
   # Validations
   # #################################################
@@ -423,7 +467,7 @@ class Environment &lt; ActiveRecord::Base
     self.find(:first, :conditions => [ 'is_default = ?', true ] )
   end
  
-  # returns an array with the top level categories for this environment. 
+  # returns an array with the top level categories for this environment.
   def top_level_categories
     Category.top_level_for(self)
   end
@@ -459,7 +503,7 @@ class Environment &lt; ActiveRecord::Base
     self.articles.recent(limit)
   end
  
-  has_many :events, :through => :profiles, :source => :articles, :class_name => 'Event' 
+  has_many :events, :through => :profiles, :source => :articles, :class_name => 'Event'
  
   has_many :tags, :through => :articles
  
@@ -491,7 +535,7 @@ class Environment &lt; ActiveRecord::Base
   def community_template=(value)
     settings[:community_template_id] = value.id
   end
- 
+
   def person_template
     Person.find_by_id settings[:person_template_id]
   end
@@ -56,17 +56,6 @@ class Event &lt; Article
     first_day..last_day
   end
  
-  def self.first_day_of_month(date)
-    date ||= Date.today
-    Date.new(date.year, date.month, 1)
-  end
-
-  def self.last_day_of_month(date)
-    date ||= Date.today
-    date >>= 1
-    Date.new(date.year, date.month, 1) - 1.day
-  end
-
   def date_range
     start_date..(end_date||start_date)
   end
@@ -48,14 +48,20 @@ class Organization &lt; Profile
   end
  
   FIELDS = %w[
+    display_name
+    description
     contact_person
-    contact_phone
     contact_email
-    description
+    contact_phone
     legal_form
     economic_activity
     management_information
     address
+    zip_code
+    city
+    state
+    country
+    tag_list
   ]
  
   def self.fields
@@ -70,8 +76,12 @@ class Organization &lt; Profile
     []
   end
  
-  N_('Contact person'); N_('Contact email'); N_('Acronym'); N_('Foundation year'); N_('Legal form'); N_('Economic activity'); N_('Management information'); N_('Validated')
-  settings_items :contact_person, :contact_email, :acronym, :foundation_year, :legal_form, :economic_activity, :management_information, :validated, :cnpj
+  def signup_fields
+    []
+  end
+
+  N_('Display name'); N_('Description'); N_('Contact person'); N_('Contact email'); N_('Acronym'); N_('Foundation year'); N_('Legal form'); N_('Economic activity'); N_('Management information'); N_('Validated'); N_('Tag list')
+  settings_items :display_name, :description, :contact_person, :contact_email, :acronym, :foundation_year, :legal_form, :economic_activity, :management_information, :validated, :cnpj
  
   validates_format_of :foundation_year, :with => Noosfero::Constants::INTEGER_FORMAT
  
@@ -58,7 +58,7 @@ class UploadedFile &lt; Article
     article = self
     if image?
       lambda do
-        if article.display_as_gallery?
+        if article.display_as_gallery? && options[:gallery_view]
           images = article.parent.images
           current_index = images.index(article)
           total_of_images = images.count
@@ -9,6 +9,8 @@
  
   <%= f.text_field :email %>
  
+  <%= f.hidden_field :environment_id, :value => environment.id %>
+
 <div>
   <% button_bar do %>
     <%= submit_button('send', _('Send instructions')) %>
@@ -28,9 +28,6 @@
  
   <%= select_categories(:article, _('Categorize your article')) %>
  
-  <%= f.text_field('tag_list', :size => 64) %>
-  <%= content_tag( 'small', _('Separate tags with commas') ) %>
-
   <div id='edit-article-options'>
     <%= options_for_article(@article) %>
   </div>
-<% add_rss_feed_to_head(article.name, article.feed.url)  if article.blog? && article.feed %>
+<% add_rss_feed_to_head(@page.name, @page.feed.url)  if @page.blog? && @page.feed %>
  
-<%= content_tag('em', _('(external feed was not loaded yet)'), :id => 'external-feed-info', :class => 'metadata') if article.blog? && article.external_feed && article.external_feed.enabled && article.external_feed.fetched_at.nil? %>
+<%= content_tag('em', _('(external feed was not loaded yet)'), :id => 'external-feed-info', :class => 'metadata') if @page.blog? && @page.external_feed && @page.external_feed.enabled && @page.external_feed.fetched_at.nil? %>
  
 <div>
-  <%= link_to(image_tag('icons-mime/rss-feed.png'), article.feed.url, :class => 'blog-feed-link') if article.blog? && article.feed %>
+  <%= link_to(image_tag('icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.blog? && @page.feed %>
   <div class='blog-description'>
-    <%= article.body %>
+    <%= @page.body %>
   </div>
 </div>
 <hr class="pre-posts"/>
 <div class="blog-posts">
-  <%= (children.compact.empty? ? content_tag('em', _('(no posts)')) : list_posts(user, children, article.visualization_format)) %>
+  <%= (@posts.compact.empty? ? content_tag('em', _('(no posts)')) : list_posts(@posts, @page.visualization_format)) %>
 </div>
@@ -86,7 +86,8 @@
  
 <% cache(@page.cache_key(params, user)) do %>
   <div class="<%="article-body article-body-" + @page.css_class_name %>">
-    <%= article_to_html(@page) %>
+    <% options = @page.image? ? {:gallery_view => true} : {} %>
+    <%= article_to_html(@page, options) %>
     <br style="clear:both" />
   </div> <!-- end class="article-body" -->
 <% end %>
@@ -20,8 +20,8 @@
  
   <% labelled_form_for(:create_enterprise, @create_enterprise) do |f| %>
     <%= required f.text_field 'name', :onchange => "updateUrlField(this, 'create_enterprise_identifier')", :size => 40 %>
-    <%= required labelled_form_field(_('Address'), content_tag('code', environment.top_url + "/" + text_field(:create_enterprise, 'identifier', :size => 25))) %>
-    <%= render :partial => 'shared/custom_fields', :locals => { :f => f, :object_name => :create_enterprise, :profile => @create_enterprise, :only_required => false } %>
+    <%= required labelled_form_field(_('Address'), content_tag('code', environment.top_url + "/" + text_field(:create_enterprise, 'identifier', :size => 26))) %>
+    <%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => :create_enterprise, :profile => @create_enterprise } %>
     <%= required labelled_form_field(_('Region'), f.select('region_id', @regions)) if @validation == :region %>
  
     <% if @validation == :admin %>
@@ -7,18 +7,25 @@
     <th><%= _('Field') %></th>
     <th><%= _('Active') %></th>
     <th><%= _('Required') %></th>
+    <th><%= _('Display on creation?') %></th>
   </tr>
   <% @community_fields.each do |field| %>
   <tr>
     <td><label for="community_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td>
+
     <td>
-      <%= check_box_tag "community_fields[#{field}][active]", true, environment.custom_community_field(field, 'active'), :onclick => "$('community_fields[#{field}][required]').disabled=!this.checked" %>
+      <%= check_box_tag "community_fields[#{field}][active]", true, environment.custom_community_field(field, 'active'), :onclick => "$('community_fields[#{field}][required]').disabled=$('community_fields[#{field}][signup]').disabled=!this.checked;" %>
       <%= hidden_field_tag  "community_fields[#{field}][active]", false %>
     </td>
     <td>
-      <%= check_box_tag "community_fields[#{field}][required]", true, environment.custom_community_field(field, 'required') %>
+      <%= check_box_tag "community_fields[#{field}][required]", true, environment.custom_community_field(field, 'required'), :onclick => "if(this.checked) $('community_fields[#{field}][signup]').checked = true;" %>
       <%= hidden_field_tag  "community_fields[#{field}][required]", false %>
     </td>
+    <td>
+      <%= check_box_tag "community_fields[#{field}][signup]", true, environment.custom_community_field(field, 'signup'), :onclick => "if(!this.checked) $('community_fields[#{field}][required]').checked = false;" %>
+      <%= hidden_field_tag  "community_fields[#{field}][signup]", false %>
+    </td>
+
   </tr>
   <% end %>
 </table>
@@ -7,18 +7,25 @@
     <th><%= _('Field') %></th>
     <th><%= _('Active') %></th>
     <th><%= _('Required') %></th>
+    <th><%= _('Display on registration?') %></th>
   </tr>
   <% @enterprise_fields.each do |field| %>
   <tr>
+
     <td><label for="enterprise_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td>
     <td>
-      <%= check_box_tag "enterprise_fields[#{field}][active]", true, environment.custom_enterprise_field(field, 'active'), :onclick => "$('enterprise_fields[#{field}][required]').disabled=!this.checked" %>
+      <%= check_box_tag "enterprise_fields[#{field}][active]", true, environment.custom_enterprise_field(field, 'active'), :onclick => "$('enterprise_fields[#{field}][required]').disabled=$('enterprise_fields[#{field}][signup]').disabled=!this.checked;" %>
       <%= hidden_field_tag  "enterprise_fields[#{field}][active]", false %>
     </td>
     <td>
-      <%= check_box_tag "enterprise_fields[#{field}][required]", true, environment.custom_enterprise_field(field, 'required') %>
+      <%= check_box_tag "enterprise_fields[#{field}][required]", true, environment.custom_enterprise_field(field, 'required'), :onclick => "if(this.checked) $('enterprise_fields[#{field}][signup]').checked = true;" %>
       <%= hidden_field_tag  "enterprise_fields[#{field}][required]", false %>
     </td>
+    <td>
+      <%= check_box_tag "enterprise_fields[#{field}][signup]", true, environment.custom_enterprise_field(field, 'signup'), :onclick => "if(!this.checked) $('enterprise_fields[#{field}][required]').checked = false;" %>
+      <%= hidden_field_tag  "enterprise_fields[#{field}][signup]", false %>
+    </td>
+
   </tr>
   <% end %>
 </table>
@@ -13,15 +13,15 @@
   <tr>
     <td><label for="person_fields[<%= field %>][active]"><%= _(field.humanize) %></label></td>
     <td>
-      <%= check_box_tag "person_fields[#{field}][active]", true, environment.custom_person_field(field, 'active'), :onclick => "$('person_fields[#{field}][required]').disabled=$('person_fields[#{field}][signup]').disabled=!this.checked" %>
+      <%= check_box_tag "person_fields[#{field}][active]", true, environment.custom_person_field(field, 'active'), :onclick => "$('person_fields[#{field}][required]').disabled=$('person_fields[#{field}][signup]').disabled=!this.checked;" %>
       <%= hidden_field_tag  "person_fields[#{field}][active]", false %>
     </td>
     <td>
-      <%= check_box_tag "person_fields[#{field}][required]", true, environment.custom_person_field(field, 'required') %>
+      <%= check_box_tag "person_fields[#{field}][required]", true, environment.custom_person_field(field, 'required'), :onclick => "if(this.checked) $('person_fields[#{field}][signup]').checked = true;" %>
       <%= hidden_field_tag  "person_fields[#{field}][required]", false %>
     </td>
     <td>
-      <%= check_box_tag "person_fields[#{field}][signup]", true, environment.custom_person_field(field, 'signup') %>
+      <%= check_box_tag "person_fields[#{field}][signup]", true, environment.custom_person_field(field, 'signup'), :onclick => "if(!this.checked) $('person_fields[#{field}][required]').checked = false;" %>
       <%= hidden_field_tag  "person_fields[#{field}][signup]", false %>
     </td>
   </tr>
@@ -22,10 +22,7 @@
  
   <%= hidden_field_tag :wizard, params[:wizard] %>
  
-  <%= render :partial => 'shared/custom_fields', :locals => { :f => f, :object_name => 'community', :profile => @community, :only_required => true } %>
-
-  <%= f.text_field('tag_list', :size => 64) %>
-  <%= content_tag( 'small', _('Separate tags with commas.') + '<br/>' + __("Tags are important to new users, they'll be able to find your new community more easily.") ) %>
+  <%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => 'community', :profile => @community } %>
  
   <% f.fields_for :image_builder, @community.image do |i| %>
     <%= file_field_or_thumbnail(_('Image:'), @community.image, i) %>
@@ -14,14 +14,6 @@
   </script>
 <% end %>
  
-<div class="formfieldline">
-  <label class="formlabel" for="profile_data_nickname"><%= _('Display name') %></label>
-  <div class="formfield type-text">
-    <%= text_field_tag 'profile_data[nickname]', @profile_data.nickname, :id => 'profile_data_nickname', :size => 30, :maxlength => 16, :onchange => (@environment.enabled?('enable_organization_url_change') ? "updateUrlField(this, 'profile_data_identifier')" : "") %>
-    <em><%= _('A short name by which the organization is know.')%></em>
-  </div>
-</div>
-
 <% if @environment.enabled?('enable_organization_url_change') %>
   <script type="text/javascript">
     function submit_button() {
@@ -45,7 +37,7 @@
  
     <%= hidden_field_tag 'old_profile_identifier', @profile.identifier %>
     <div id="profile-identifier-formitem">
-      <%= labelled_form_field( _('Address'),
+      <%= required labelled_form_field( _('Address'),
             content_tag('code',
               url_for(profile.url).gsub(/#{profile.identifier}$/, '') +
               text_field(:profile_data, :identifier, :onchange => "warn_value_change()", :size => 25)
@@ -66,7 +58,7 @@
     </div>
 <% end %>
  
-  <%= render :partial => 'shared/custom_fields', :locals => { :f => f, :object_name => 'profile_data', :profile => @profile, :only_required => false } %>
+  <%= render :partial => 'shared/organization_custom_fields', :locals => { :f => f, :object_name => 'profile_data', :profile => @profile } %>
  
   <%= labelled_check_box(_('Enable "contact us"'), 'profile_data[enable_contact_us]', "1", @profile.enable_contact_us) if @profile.enterprise? %>
  
@@ -1,25 +0,0 @@
-<% if profile.community? %>
-  <%= optional_field(profile, 'language', f.text_field(:language), only_required) %>
-<% end %>
-
-<%= optional_field(profile, 'description', f.text_area(:description, :rows => 5)) %> <!-- , :maxlength => 10 -->
-<%= optional_field(profile, 'contact_person', f.text_field(:contact_person), only_required) %>
-<%= optional_field(profile, 'contact_email', f.text_field(:contact_email), only_required) %>
-<%= optional_field(profile, 'contact_phone', f.text_field(:contact_phone), only_required) %>
-<%= optional_field(profile, 'legal_form', f.text_field(:legal_form), only_required) %>
-<%= optional_field(profile, 'economic_activity', f.text_field(:economic_activity), only_required) %>
-<%= optional_field(profile, 'management_information', f.text_area(:management_information, :rows => 5), only_required) %>
-<%= optional_field(profile, 'address', labelled_form_field(_('Address (street and number)'), text_field(object_name, :address)), only_required) %>
-
-<% if profile.enterprise? %>
-  <%= optional_field(profile, 'business_name', f.text_field(:business_name), only_required) %>
-  <%= optional_field(profile, 'zip_code', labelled_form_field(_('ZIP code'), text_field(object_name, :zip_code)), only_required) %>
-  <%= optional_field(profile, 'city', f.text_field(:city), only_required) %>
-  <%= optional_field(profile, 'state', f.text_field(:state), only_required) %>
-  <%= optional_field(profile, 'country', select_country(_('Country'), object_name, 'country', {:class => 'type-select'}), only_required) %>
-  <%= optional_field(profile, 'organization_website', f.text_field(:organization_website), only_required) %>
-  <%= optional_field(profile, 'historic_and_current_context', f.text_area(:historic_and_current_context, :rows => 5), only_required) %>
-  <%= optional_field(profile, 'activities_short_description', f.text_area(:activities_short_description, :rows => 5), only_required) %>
-  <%= optional_field(profile, 'acronym', f.text_field(:acronym), only_required) %>
-  <%= optional_field(profile, 'foundation_year', f.text_field(:foundation_year), only_required) %>
-<% end %>
@@ -0,0 +1,27 @@
+<%= optional_field(profile, 'display_name', f.text_field(:display_name)) %>
+<%= optional_field(profile, 'description', f.text_area(:description, :rows => 5)) %> <!-- , :maxlength => 10 -->
+<%= optional_field(profile, 'contact_person', f.text_field(:contact_person)) %>
+<%= optional_field(profile, 'contact_email', f.text_field(:contact_email)) %>
+<%= optional_field(profile, 'contact_phone', f.text_field(:contact_phone)) %>
+<%= optional_field(profile, 'legal_form', f.text_field(:legal_form)) %>
+<%= optional_field(profile, 'economic_activity', f.text_field(:economic_activity)) %>
+<%= optional_field(profile, 'management_information', f.text_area(:management_information, :rows => 5)) %>
+<%= optional_field(profile, 'address', labelled_form_field(_('Address (street and number)'), text_field(object_name, :address))) %>
+<%= optional_field(profile, 'zip_code', labelled_form_field(_('ZIP code'), text_field(object_name, :zip_code))) %>
+<%= optional_field(profile, 'city', f.text_field(:city)) %>
+<%= optional_field(profile, 'state', f.text_field(:state)) %>
+<%= optional_field(profile, 'country', select_country(_('Country'), object_name, 'country', {:class => 'type-select'})) %>
+<%= optional_field(profile, 'tag_list', f.text_field(:tag_list)) %>
+
+<% if profile.community? %>
+  <%= optional_field(profile, 'language', f.text_field(:language)) %>
+<% end %>
+
+<% if profile.enterprise? %>
+  <%= optional_field(profile, 'business_name', f.text_field(:business_name)) %>
+  <%= optional_field(profile, 'organization_website', f.text_field(:organization_website)) %>
+  <%= optional_field(profile, 'historic_and_current_context', f.text_area(:historic_and_current_context, :rows => 5)) %>
+  <%= optional_field(profile, 'activities_short_description', f.text_area(:activities_short_description, :rows => 5)) %>
+  <%= optional_field(profile, 'acronym', f.text_field(:acronym)) %>
+  <%= optional_field(profile, 'foundation_year', f.text_field(:foundation_year)) %>
+<% end %>
@@ -10,7 +10,7 @@ Feature: Location
     And I am logged in as "zezinho"
  
   Scenario: editing my address
-    Given the following Person fields are active
+    Given the following Person fields are active fields
       | address  |
       | country  |
       | state    |
@@ -29,7 +29,7 @@ Feature: Location
       | Rua Marechal Floriano, 28 | BR      | Bahia | Salvador | 40110010 |
  
   Scenario Outline: editing address of collectives
-    Given the following <class> fields are active
+    Given the following <class> fields are active fields
       | address  |
       | country  |
       | state    |
@@ -0,0 +1,101 @@
+Feature: organization custom fields
+  As a noosfero admin
+  I want to choose what fields are active or required for organizations
+  In order to have more consistency in the system
+
+  Background:
+    Given the following users
+      | login     | name       |
+      | joaosilva | Joao Silva |
+    And I am logged in as "joaosilva"
+    And feature "enterprise_registration" is enabled on environment
+    And I follow "Control panel"
+
+  Scenario Outline: organization active fields are not displayed on creation
+    Given the following <organization> fields are active fields
+      | display_name  |
+      | contact_email |
+      | city          |
+    And I follow "Manage my groups"
+    When I follow <creation_button>
+    Then I should not see "Display name"
+    Then I should not see "Contact email"
+    Then I should not see "City"
+  Examples:
+    | organization  | creation_button             |
+    | community     | "Create a new community"    |
+    | enterprise    | "Register a new enterprise" |
+
+  Scenario Outline: organization active fields are displayed on edition
+    Given the following <organization> fields are active fields
+      | display_name  |
+      | contact_email |
+      | city          |
+    And the following <organization>
+      | name          | identifier    |
+      | Organization  | organization  |
+    And "Joao Silva" is admin of "Organization"
+    And I am on Organization's control panel
+    And I follow <information>
+    Then I should see "Display name"
+    Then I should see "Contact email"
+    Then I should see "City"
+  Examples:
+    | organization  | information                     |
+    | community     | "Community Info and settings"   |
+    | enterprise    | "Enterprise Info and settings"  |
+
+  Scenario Outline: organization required fields are displayed on creation
+    Given the following <organization> fields are required fields
+      | display_name  |
+      | contact_email |
+      | city          |
+    And I follow "Manage my groups"
+    And I follow <creation_button>
+    When I press <confirmation_button>
+    Then I should see "Display name can't be blank"
+    Then I should see "Contact email can't be blank"
+    Then I should see "City can't be blank"
+  Examples:
+    | organization  | creation_button             | confirmation_button |
+    | community     | "Create a new community"    | "Create"            |
+    | enterprise    | "Register a new enterprise" |  "Next"             |
+
+  Scenario Outline: organization required fields are displayed on edition
+    Given the following <organization> fields are required fields
+      | display_name  |
+      | contact_email |
+      | city          |
+    And the following <organization>
+      | name          | identifier    | display_name | contact_email | city |
+      | Organization  |  organization | organization | bla@bleee.com | city |
+    And "Joao Silva" is admin of "Organization"
+    And I am on Organization's control panel
+    And I follow <information>
+    And I fill in the following:
+      | Display name  | |
+      | Contact email | |
+      | City          | |
+    When I press "Save"
+    Then I should see "Display name can't be blank"
+    Then I should see "Contact email can't be blank"
+    Then I should see "City can't be blank"
+  Examples:
+    | organization  | information                     |
+    | community     | "Community Info and settings"   |
+    | enterprise    | "Enterprise Info and settings"  |
+
+  Scenario Outline: organization signup fields are displayed on creation
+    Given the following <organization> fields are signup fields
+      | display_name  |
+      | contact_email |
+      | city          |
+    And I follow "Manage my groups"
+    When I follow <creation_button>
+    Then I should see "Display name"
+    Then I should see "Contact email"
+    Then I should see "City"
+  Examples:
+    | organization  | creation_button             |
+    | community     | "Create a new community"    |
+    | enterprise    | "Register a new enterprise" |
@@ -54,7 +54,7 @@ Feature: publish article
     And I follow "Spread"
     And I check "Sample Community"
     When I press "Publish"
-    Then I should see "Validation failed: The title (article name) is already being used by another article, please use another title.:"
+    Then I should see "The title (article name) is already being used by another article, please use another title."
  
   Scenario: publishing an article in many communities and listing the communities that couldn't publish the article again,
             stills publishing the article in the other communities.
@@ -79,7 +79,7 @@ Feature: publish article
     And I check "Another Community1"
     And I check "Another Community2"
     When I press "Publish"
-    Then I should see "Validation failed: The title (article name) is already being used by another article, please use another title.:"
+    Then I should see "The title (article name) is already being used by another article, please use another title."
     And I am on Another Community1's homepage
     And I follow "View profile"
     When I go to Another Community1's sitemap
@@ -110,9 +110,9 @@ Feature: publish article
     And I am on Sample Community's control panel
     And I follow "Tasks"
     And I press "Ok!"
-    And I should not see "Validation failed: The title (article name) is already being used by another article, please use another title.:"
+    And I should not see "The title (article name) is already being used by another article, please use another title."
     When I press "Ok!"
-    Then I should see "Validation failed: The title (article name) is already being used by another article, please use another title."
+    Then I should see "The title (article name) is already being used by another article, please use another title."
  
   Scenario: ask to publish an article that was deleted before approval
     Given I am logged in as "joaosilva"
@@ -44,8 +44,8 @@ Feature: register enterprise
     When I follow "Register a new enterprise"
     Then I should see "There are no validators to validate the registration of this new enterprise. Contact your administrator for instructions."
  
-  Scenario: some active fields
-    Given the following enterprise fields are active
+  Scenario: some signup fields
+    Given the following enterprise fields are signup fields
       | foundation_year |
       | contact_person  |
       | contact_email   |
@@ -61,7 +61,7 @@ Feature: register enterprise
     And the following states
       | name          |
       | Sample State  |
-    And the following enterprise fields are required
+    And the following enterprise fields are required fields
       | foundation_year |
       | contact_person  |
       | contact_email   |
@@ -144,18 +144,21 @@ Given /^&quot;([^\&quot;]*)&quot; has no articles$/ do |profile|
   (Profile[profile] || Profile.find_by_name(profile)).articles.delete_all
 end
  
-Given /^the following (\w+) fields are (\w+)$/ do |klass, status, table|
+Given /^the following (\w+) fields are (\w+) fields$/ do |klass, status, table|
   env = Environment.default
   fields = table.raw.inject({}) do |hash, line|
-    hash[line.first] = { "active" => 'true' }
-    hash[line.first].merge!({ "required" => 'true'}) if status == "required"
+    hash[line.first] = {}
+    hash[line.first].merge!({ "active" => 'true' })   if status == "active"
+    hash[line.first].merge!({ "required" => 'true'})  if status == "required"
+    hash[line.first].merge!({ "signup" => 'true'})    if status == "signup"
     hash
   end
  
   env.send("custom_#{klass.downcase}_fields=", fields)
   env.save!
+
   if fields.keys != env.send("#{status}_#{klass.downcase}_fields")
-    raise "Not all fields #{status}! Requested: %s; #{status.camelcase}: %s" % [fields.keys.inspect, env.send("#{status}_#{klass.downcase}_fields").inspect] 
+    raise "Not all fields #{status}! Requested: %s; #{status.camelcase}: %s" % [fields.keys.inspect, env.send("#{status}_#{klass.downcase}_fields").inspect]
   end
 end
  
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.24.1'
+  VERSION = '0.24.2'
  
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -265,7 +265,7 @@ class AccountControllerTest &lt; Test::Unit::TestCase
  
   should 'require password confirmation correctly to enter new pasword' do
     user = create_user('testuser', :email => 'testuser@example.com', :password => 'test', :password_confirmation => 'test')
-    change = ChangePassword.create!(:login => 'testuser', :email => 'testuser@example.com')
+    change = ChangePassword.create!(:login => 'testuser', :email => 'testuser@example.com', :environment_id => Environment.default.id)
  
     post :new_password, :code => change.code, :change_password => { :password => 'onepass', :password_confirmation => 'another_pass' }
     assert_response :success
@@ -603,10 +603,27 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
     assert_response :missing
   end
  
+  should 'list unpublished posts to owner with a different class' do
+    login_as('testinguser')
+    blog = Blog.create!(:name => 'A blog test', :profile => profile)
+    blog.posts << TextileArticle.create!(:name => 'Post', :profile => profile, :parent => blog, :published => false)
+
+    get :view_page, :profile => profile.identifier, :page => [blog.path]
+    assert_tag :tag => 'div', :attributes => {:class => /not-published/}
+  end
+
+  should 'not list unpublished posts to a not logged person' do
+    blog = Blog.create!(:name => 'A blog test', :profile => profile)
+    blog.posts << TextileArticle.create!(:name => 'Post', :profile => profile, :parent => blog, :published => false)
+
+    get :view_page, :profile => profile.identifier, :page => [blog.path]
+    assert_no_tag :tag => 'a', :content => "Post"
+  end
+
   should 'display pagination links of blog' do
     blog = Blog.create!(:name => 'A blog test', :profile => profile, :posts_per_page => 5)
     for n in 1..10
-      blog.children << TextileArticle.create!(:name => "Post #{n}", :profile => profile, :parent => blog)
+      blog.posts << TextileArticle.create!(:name => "Post #{n}", :profile => profile, :parent => blog)
     end
     assert_equal 10, blog.posts.size
  
@@ -614,11 +631,17 @@ class ContentViewerControllerTest &lt; Test::Unit::TestCase
     assert_tag :tag => 'a', :attributes => { :href => "/#{profile.identifier}/#{blog.path}?npage=2", :rel => 'next' }
   end
  
-  should 'set year and month filter from URL params' do
-    profile.articles << Blog.new(:name => 'A blog test', :profile => profile)
-    year, month = profile.blog.created_at.year.to_s, '%02d' % profile.blog.created_at.month
-    get :view_page, :profile => profile.identifier, :page => [profile.blog.path], :year => year, :month => month
-    assert_equal({ :year => year.to_s, :month => month.to_s }, assigns(:page).filter)
+  should 'display filtered posts' do
+    blog = Blog.create!(:name => 'A blog test', :profile => profile)
+    not_display_post = TextileArticle.new(:name => "Post 1", :profile => profile, :parent => blog)
+    display_post = TextileArticle.new(:name => "Post 2", :profile => profile, :parent => blog)
+
+    not_display_post.update_attribute(:published_at, DateTime.parse('2009-09-10'))
+    display_post.update_attribute(:published_at, DateTime.parse('2010-09-10'))
+
+    get :view_page, :profile => profile.identifier, :page => [blog.path], :year => 2010, :month => 9
+    assert_no_tag :tag => 'a', :content => "Post 1"
+    assert_tag :tag => 'a', :content => "Post 2"
   end
  
   should 'give link to create new article inside folder when view child of folder' do
@@ -19,7 +19,7 @@ class ForgotPasswordTest &lt; ActionController::IntegrationTest
     assert_response :success
     assert_tag :tag => 'form', :attributes => { :action => '/account/forgot_password', :method => 'post' }
  
-    post '/account/forgot_password', :change_password => { :login => 'forgotten', :email => 'forgotten@localhost.localdomain' }
+    post '/account/forgot_password', :change_password => { :login => 'forgotten', :email => 'forgotten@localhost.localdomain', :environment_id => Environment.default.id }
  
     assert_response :success
     assert_template 'password_recovery_sent'
@@ -244,17 +244,44 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
     assert_equal '', profile_sex_icon(Person.new(:sex => 'male'))
   end
  
-  should 'display field on signup' do
-    env = fast_create(Environment, :name => 'env test')
+  should 'display field on person signup' do
+    env = Environment.create!(:name => 'env test')
     stubs(:environment).returns(env)
  
     controller = mock
     stubs(:controller).returns(controller)
     controller.expects(:action_name).returns('signup')
  
-    profile = Person.new
-    profile.expects(:signup_fields).returns(['field'])
-    assert_equal 'SIGNUP_FIELD', optional_field(profile, 'field', 'SIGNUP_FIELD')
+    person = Person.new
+    person.expects(:signup_fields).returns(['field'])
+    assert_equal 'SIGNUP_FIELD', optional_field(person, 'field', 'SIGNUP_FIELD')
+  end
+
+  should 'display field on enterprise registration' do
+    env = Environment.create!(:name => 'env test')
+    stubs(:environment).returns(env)
+
+    controller = mock
+    stubs(:controller).returns(controller)
+    controller.stubs(:controller_name).returns('enterprise_registration')
+    controller.stubs(:action_name).returns('index')
+
+    enterprise = Enterprise.new
+    enterprise.expects(:signup_fields).returns(['field'])
+    assert_equal 'SIGNUP_FIELD', optional_field(enterprise, 'field', 'SIGNUP_FIELD')
+  end
+
+  should 'display field on community creation' do
+    env = Environment.create!(:name => 'env test')
+    stubs(:environment).returns(env)
+
+    controller = mock
+    stubs(:controller).returns(controller)
+    controller.stubs(:action_name).returns('new_community')
+
+    community = Community.new
+    community.expects(:signup_fields).returns(['field'])
+    assert_equal 'SIGNUP_FIELD', optional_field(community, 'field', 'SIGNUP_FIELD')
   end
  
   should 'not display field on signup' do
@@ -265,9 +292,36 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
     stubs(:controller).returns(controller)
     controller.expects(:action_name).returns('signup')
  
-    profile = Person.new
-    profile.expects(:signup_fields).returns([])
-    assert_equal '', optional_field(profile, 'field', 'SIGNUP_FIELD')
+    person = Person.new
+    person.expects(:signup_fields).returns([])
+    assert_equal '', optional_field(person, 'field', 'SIGNUP_FIELD')
+  end
+
+  should 'not display field on enterprise registration' do
+    env = Environment.create!(:name => 'env test')
+    stubs(:environment).returns(env)
+
+    controller = mock
+    stubs(:controller).returns(controller)
+    controller.stubs(:controller_name).returns('enterprise_registration')
+    controller.stubs(:action_name).returns('index')
+
+    enterprise = Enterprise.new
+    enterprise.expects(:signup_fields).returns([])
+    assert_equal '', optional_field(enterprise, 'field', 'SIGNUP_FIELD')
+  end
+
+  should 'not display field on community creation' do
+    env = Environment.create!(:name => 'env test')
+    stubs(:environment).returns(env)
+
+    controller = mock
+    stubs(:controller).returns(controller)
+    controller.stubs(:action_name).returns('new_community')
+
+    community = Community.new
+    community.stubs(:signup_fields).returns([])
+    assert_equal '', optional_field(community, 'field', 'SIGNUP_FIELD')
   end
  
   should 'display active fields' do
@@ -276,7 +330,8 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
  
     controller = mock
     stubs(:controller).returns(controller)
-    controller.expects(:action_name).returns('edit')
+    controller.stubs(:controller_name).returns('')
+    controller.stubs(:action_name).returns('edit')
  
     profile = Person.new
     profile.expects(:active_fields).returns(['field'])
@@ -289,7 +344,8 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
  
     controller = mock
     stubs(:controller).returns(controller)
-    controller.expects(:action_name).returns('edit')
+    controller.stubs(:action_name).returns('edit')
+    controller.stubs(:controller_name).returns('')
  
     profile = Person.new
     profile.expects(:active_fields).returns([])
@@ -302,7 +358,8 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
  
     controller = mock
     stubs(:controller).returns(controller)
-    controller.expects(:action_name).returns('edit')
+    controller.stubs(:controller_name).returns('')
+    controller.stubs(:action_name).returns('edit')
  
     stubs(:required).with('SIGNUP_FIELD').returns('<span>SIGNUP_FIELD</span>')
     profile = Person.new
@@ -311,21 +368,6 @@ class ApplicationHelperTest &lt; Test::Unit::TestCase
     assert_equal '<span>SIGNUP_FIELD</span>', optional_field(profile, 'field', 'SIGNUP_FIELD')
   end
  
-  should 'display required fields on signup even if admin did not marked field to show up in signup' do
-    env = Environment.create!(:name => 'env test')
-    stubs(:environment).returns(env)
-
-    controller = mock
-    stubs(:controller).returns(controller)
-    controller.expects(:action_name).returns('signup')
-
-    stubs(:required).with('SIGNUP_FIELD').returns('<span>SIGNUP_FIELD</span>')
-    profile = Person.new
-    profile.stubs(:required_fields).returns(['field'])
-    profile.stubs(:signup_fields).returns([])
-    assert_equal '<span>SIGNUP_FIELD</span>', optional_field(profile, 'field', 'SIGNUP_FIELD')
-  end
-
   should 'not ask_to_join unless profile defined' do
     stubs(:params).returns({})
  
@@ -115,6 +115,21 @@ class ArticleBlockTest &lt; Test::Unit::TestCase
     assert_match(/image/, instance_eval(&block.content))
   end
  
+  should 'not display gallery pages navigation in content' do
+    profile = create_user('testuser').person
+    block = ArticleBlock.new
+    gallery = fast_create(Folder, :profile_id => profile.id)
+    gallery.view_as = 'image_gallery'
+    gallery.save!
+    image = UploadedFile.create!(:profile => profile, :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png'), :parent => gallery)
+    block.article = image
+    block.save!
+
+    expects(:image_tag).with(image.public_filename(:display), :class => image.css_class_name, :style => 'max-width: 100%').returns('image')
+
+    assert_no_match(/Previous/, instance_eval(&block.content))
+  end
+
   should 'display link to archive if article is an archive' do
     profile = create_user('testuser').person
     block = ArticleBlock.new
@@ -873,4 +873,22 @@ class ArticleTest &lt; Test::Unit::TestCase
     assert_no_match /[<>]/, article.name
   end
  
+  should 'found articles with published date between a range' do
+    start_date = DateTime.parse('2010-07-06')
+    end_date = DateTime.parse('2010-08-02')
+
+    article_found1 = fast_create(Article, :published_at => start_date)
+    article_found2 = fast_create(Article, :published_at => end_date)
+    article_not_found = fast_create(Article, :published_at => end_date + 1.month)
+
+    assert_includes Article.by_range(start_date..end_date), article_found1
+    assert_includes Article.by_range(start_date..end_date), article_found2
+    assert_not_includes Article.by_range(start_date..end_date), article_not_found
+  end
+
+  should 'calculate first/end day of a month' do
+    assert_equal 1, Article.first_day_of_month(DateTime.parse('2010-07-06')).day
+    assert_equal 31, Article.last_day_of_month(DateTime.parse('2010-07-06')).day
+  end
+
 end
@@ -27,28 +27,7 @@ class BlogHelperTest &lt; Test::Unit::TestCase
     expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", :class => 'blog-post position-1 first last odd-post-inner', :id => "post-#{published_post.id}").returns('POST')
     expects(:content_tag).with('div', 'POST', {:class => 'odd-post'}).returns('RESULT')
  
-    assert_equal 'RESULT', list_posts(profile, blog.posts)
-  end
-
-  should 'list unpublished posts to owner with a different class' do
-    blog.children << unpublished_post = TextileArticle.create!(:name => 'Post', :profile => profile, :parent => blog, :published => false)
-
-    expects(:display_post).with(anything, anything).returns('POST')
-    expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", :class => 'blog-post position-1 first last not-published odd-post-inner', :id => "post-#{unpublished_post.id}").returns('POST')
-    expects(:content_tag).with('div', 'POST', {:class => 'odd-post'}).returns('RESULT')
-    assert_equal 'RESULT', list_posts(profile, blog.posts)
-  end
-
-  should 'not list unpublished posts to not owner' do
-    blog.children << unpublished_post = TextileArticle.create!(:name => 'First post', :profile => profile, :parent => blog, :published => false)
-
-    blog.children << published_post = TextileArticle.create!(:name => 'Second post', :profile => profile, :parent => blog, :published => true)
-
-    expects(:display_post).with(anything, anything).returns('POST')
-    expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", has_entries(:id => "post-#{unpublished_post.id}")).never
-    expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", has_entries(:id => "post-#{published_post.id}")).returns('POST')
-    expects(:content_tag).with('div', 'POST', {:class => 'odd-post'}).returns('RESULT')
-    assert_equal 'RESULT', list_posts(nil, blog.posts)
+    assert_equal 'RESULT', list_posts(blog.posts)
   end
  
   should 'list even/odd posts with a different class' do
@@ -64,7 +43,7 @@ class BlogHelperTest &lt; Test::Unit::TestCase
     expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", :class => 'blog-post position-2 last even-post-inner', :id => "post-#{older_post.id}").returns('POST 2')
     expects(:content_tag).with('div', "POST 2", :class => 'even-post').returns('EVEN-POST')
  
-    assert_equal "ODD-POST\n<hr class='sep-posts'/>\nEVEN-POST", list_posts(nil, blog.posts)
+    assert_equal "ODD-POST\n<hr class='sep-posts'/>\nEVEN-POST", list_posts(blog.posts)
   end
  
  
@@ -82,13 +82,6 @@ class BlogTest &lt; ActiveSupport::TestCase
     assert_equal [newer, older], blog.posts
   end
  
-  should 'has filter' do
-    p = create_user('testuser').person
-    blog = fast_create(Blog, :profile_id => p.id, :name => 'Blog test')
-    blog.filter = {:param => 'value'}
-    assert_equal 'value', blog.filter[:param]
-  end
-
   should 'has one external feed' do
     p = create_user('testuser').person
     blog = fast_create(Blog, :profile_id => p.id, :name => 'Blog test')
@@ -14,6 +14,8 @@ class ChangePasswordTest &lt; Test::Unit::TestCase
  
     data = ChangePassword.new
     data.login = 'unexisting'
+    data.email = 'example@example.com'
+    data.environment_id = Environment.default.id
     data.valid?
     assert data.errors.invalid?(:login)
   end
@@ -35,6 +37,7 @@ class ChangePasswordTest &lt; Test::Unit::TestCase
     data = ChangePassword.new
     data.login = 'testuser'
     data.email = 'wrong@example.com'
+    data.environment_id = Environment.default.id
  
     data.valid?
     assert !data.errors.invalid?(:login)
@@ -48,6 +51,7 @@ class ChangePasswordTest &lt; Test::Unit::TestCase
     data = ChangePassword.new
     data.login = 'testuser'
     data.email = 'test@example.com'
+    data.environment_id = Environment.default.id
  
     data.valid?
     assert !data.errors.invalid?(:login)
@@ -60,6 +64,7 @@ class ChangePasswordTest &lt; Test::Unit::TestCase
     change = ChangePassword.new
     change.login = 'testuser'
     change.email = 'test@example.com'
+    change.environment_id = Environment.default.id
     change.save!
  
     change.status = Task::Status::FINISHED
@@ -80,6 +85,7 @@ class ChangePasswordTest &lt; Test::Unit::TestCase
     change = ChangePassword.new
     change.login = 'testuser'
     change.email = 'test@example.com'
+    change.environment_id = Environment.default.id
     change.save!
  
     change.expects(:requestor).returns(person).at_least_once
@@ -98,6 +104,7 @@ class ChangePasswordTest &lt; Test::Unit::TestCase
     change = ChangePassword.new
     change.login = 'testuser'
     change.email = 'test@example.com'
+    change.environment_id = Environment.default.id
     change.save!
  
     assert_nothing_raised do
@@ -111,4 +118,18 @@ class ChangePasswordTest &lt; Test::Unit::TestCase
     assert_equal t1.permission, t2.permission
   end
  
+  should 'search for user in the correct environment' do
+    e1 = Environment.create!(:id => 1, :name => "environment1")
+    e2 = Environment.create!(:id => 2, :name => "environment2")
+    p1 = create_user('sample-user', :password => 'test', :password_confirmation => 'test', :email => 'sample-user@e1.com', :environment => e1).person
+    p2 = create_user('sample-user', :password => 'test', :password_confirmation => 'test', :email => 'sample-user@e2.com', :environment => e2).person
+
+    change = ChangePassword.new
+    change.login = 'sample-user'
+    change.email = 'sample-user@e2.com'
+    change.environment_id = e2.id
+
+    assert change.valid?
+  end
+
 end
@@ -57,32 +57,10 @@ class ContentViewerHelperTest &lt; Test::Unit::TestCase
   should 'not list feed article' do
     profile.articles << Blog.new(:name => 'Blog test', :profile => profile)
     assert_includes profile.blog.children.map{|i| i.class}, RssFeed
-    result = list_posts(nil, profile.blog.posts)
+    result = list_posts(profile.blog.posts)
     assert_no_match /feed/, result
   end
  
-  should 'filter blog posts by date' do
-    blog = Blog.create!(:name => 'Blog test', :profile => profile)
-
-    nov = TextileArticle.create!(:name => 'November post', :parent => blog, :profile => profile)
-    nov.update_attributes!(:published_at => DateTime.parse('2008-11-15'))
-
-    sep = TextileArticle.create!(:name => 'September post', :parent => blog, :profile => profile)
-    sep.update_attribute(:published_at, DateTime.parse('2008-09-10'))
-
-    blog.reload
-    blog.filter = {:year => 2008, :month => 11}
-    assert blog.save!
-
-    self.stubs(:params).returns({:npage => nil})
-
-    expects(:render).with(:file => 'content_viewer/blog_page', :locals => {:article => blog, :children => [nov]}).returns("BLI")
-
-    result = article_to_html(blog)
-
-    assert_equal 'BLI', result
-  end
-
 end
  
 def show_date(date)
@@ -253,7 +253,7 @@ class EnvironmentTest &lt; Test::Unit::TestCase
     assert_raise ArgumentError do
       env.organization_approval_method = :lalala
     end
-    
+
   end
  
   should 'provide environment name in to_s' do
@@ -373,7 +373,7 @@ class EnvironmentTest &lt; Test::Unit::TestCase
  
     assert_includes env.products, p1
   end
-  
+
   should 'not have person through communities' do
     env = Environment.default
     com = fast_create(Community)
@@ -472,15 +472,15 @@ class EnvironmentTest &lt; Test::Unit::TestCase
  
     comm = fast_create(Community)
     e.community_template = comm
-    assert_equal comm, e.community_template 
+    assert_equal comm, e.community_template
  
     person = fast_create(Person)
     e.person_template = person
-    assert_equal person, e.person_template 
+    assert_equal person, e.person_template
  
     enterprise = fast_create(Enterprise)
     e.enterprise_template = enterprise
-    assert_equal enterprise, e.enterprise_template 
+    assert_equal enterprise, e.enterprise_template
   end
  
   should 'not enable ssl by default' do
@@ -523,11 +523,11 @@ class EnvironmentTest &lt; Test::Unit::TestCase
     assert_equal false, Environment.new.replace_enterprise_template_when_enable
   end
  
-  should 'set custom_person_fields' do
+  should 'set custom_person_fields with its dependecies' do
     env = Environment.new
-    env.custom_person_fields = {'cell_phone' => {'required' => 'true', 'active' => 'true'},'comercial_phone'=>  {'required' => 'true', 'active' => 'true'}}
+    env.custom_person_fields = {'cell_phone' => {'required' => 'true', 'active' => '', 'signup' => ''}, 'comercial_phone'=>  {'required' => '', 'active' => 'true', 'signup' => '' }, 'description' => {'required' => '', 'active' => '', 'signup' => 'true'}}
  
-    assert_equal({'cell_phone' => {'required' => 'true', 'active' => 'true'},'comercial_phone'=>  {'required' => 'true', 'active' => 'true'}}, env.custom_person_fields)
+    assert_equal({'cell_phone' => {'required' => 'true', 'active' => 'true', 'signup' => 'true'}, 'comercial_phone'=>  {'required' => '', 'active' => 'true', 'signup' => '' }, 'description' => {'required' => '', 'active' => 'true', 'signup' => 'true'}}, env.custom_person_fields)
   end
  
   should 'have no custom_person_fields by default' do
@@ -539,7 +539,7 @@ class EnvironmentTest &lt; Test::Unit::TestCase
     Person.stubs(:fields).returns(['cell_phone', 'comercial_phone'])
  
     env.custom_person_fields = { 'birth_date' => {'required' => 'true', 'active' => 'true'}, 'cell_phone' => {'required' => 'true', 'active' => 'true'}}
-    assert_equal({'cell_phone' => {'required' => 'true', 'active' => 'true'}}, env.custom_person_fields)
+    assert_equal({'cell_phone' => {'required' => 'true','signup' => 'true',  'active' => 'true'}}, env.custom_person_fields)
     assert ! env.custom_person_fields.keys.include?('birth_date')
   end
  
@@ -548,7 +548,7 @@ class EnvironmentTest &lt; Test::Unit::TestCase
     Person.stubs(:fields).returns(['cell_phone', 'schooling'])
  
     env.custom_person_fields = { 'schooling' => {'required' => 'true', 'active' => 'true'}}
-    assert_equal({'schooling' => {'required' => 'true', 'active' => 'true'}, 'schooling_status' => {'required' => 'true', 'active' => 'true'}}, env.custom_person_fields)
+    assert_equal({'schooling' => {'required' => 'true', 'signup' => 'true', 'active' => 'true'}, 'schooling_status' => {'required' => 'true', 'signup' => 'true', 'active' => 'true'}}, env.custom_person_fields)
     assert ! env.custom_person_fields.keys.include?('birth_date')
   end
  
@@ -596,11 +596,11 @@ class EnvironmentTest &lt; Test::Unit::TestCase
     end
   end
  
-  should 'set custom_enterprises_fields' do
+  should 'set custom_enterprise_fields with its dependencies' do
     env = Environment.new
-    env.custom_enterprise_fields = {'contact_person' => {'required' => 'true', 'active' => 'true'},'contact_email'=>  {'required' => 'true', 'active' => 'true'}}
+    env.custom_enterprise_fields = {'contact_person' => {'required' => 'true', 'active' => '', 'signup' => ''}, 'contact_email'=>  {'required' => '', 'active' => 'true', 'signup' => '' }, 'description' => {'required' => '', 'active' => '', 'signup' => 'true'}}
  
-    assert_equal({'contact_person' => {'required' => 'true', 'active' => 'true'},'contact_email'=>  {'required' => 'true', 'active' => 'true'}}, env.custom_enterprise_fields)
+    assert_equal({'contact_person' => {'required' => 'true', 'active' => 'true', 'signup' => 'true'}, 'contact_email'=>  {'required' => '', 'active' => 'true', 'signup' => '' }, 'description' => {'required' => '', 'active' => 'true', 'signup' => 'true'}} , env.custom_enterprise_fields)
   end
  
   should 'have no custom_enterprise_fields by default' do
@@ -612,7 +612,7 @@ class EnvironmentTest &lt; Test::Unit::TestCase
     Enterprise.stubs(:fields).returns(['contact_person', 'comercial_phone'])
  
     env.custom_enterprise_fields = { 'contact_email' => {'required' => 'true', 'active' => 'true'}, 'contact_person' => {'required' => 'true', 'active' => 'true'}}
-    assert_equal({'contact_person' => {'required' => 'true', 'active' => 'true'}}, env.custom_enterprise_fields)
+    assert_equal({'contact_person' => {'required' => 'true', 'signup' => 'true', 'active' => 'true'}}, env.custom_enterprise_fields)
     assert ! env.custom_enterprise_fields.keys.include?('contact_email')
   end
  
@@ -639,11 +639,11 @@ class EnvironmentTest &lt; Test::Unit::TestCase
     assert_equal ['contact_email'], env.required_enterprise_fields
   end
  
-  should 'set custom_communitys_fields' do
+  should 'set custom_community_fields with its dependencies' do
     env = Environment.new
-    env.custom_community_fields = {'contact_person' => {'required' => 'true', 'active' => 'true'},'contact_email'=>  {'required' => 'true', 'active' => 'true'}}
+    env.custom_community_fields = {'contact_person' => {'required' => 'true', 'active' => '', 'signup' => ''}, 'contact_email'=>  {'required' => '', 'active' => 'true', 'signup' => '' }, 'description' => {'required' => '', 'active' => '', 'signup' => 'true'}}
  
-    assert_equal({'contact_person' => {'required' => 'true', 'active' => 'true'},'contact_email'=>  {'required' => 'true', 'active' => 'true'}}, env.custom_community_fields)
+    assert_equal({'contact_person' => {'required' => 'true', 'active' => 'true', 'signup' => 'true'}, 'contact_email'=>  {'required' => '', 'active' => 'true', 'signup' => '' }, 'description' => {'required' => '', 'active' => 'true', 'signup' => 'true'}} , env.custom_community_fields)
   end
  
   should 'have no custom_community_fields by default' do
@@ -655,7 +655,7 @@ class EnvironmentTest &lt; Test::Unit::TestCase
     Community.stubs(:fields).returns(['contact_person', 'comercial_phone'])
  
     env.custom_community_fields = { 'contact_email' => {'required' => 'true', 'active' => 'true'}, 'contact_person' => {'required' => 'true', 'active' => 'true'}}
-    assert_equal({'contact_person' => {'required' => 'true', 'active' => 'true'}}, env.custom_community_fields)
+    assert_equal({'contact_person' => {'required' => 'true', 'signup' => 'true', 'active' => 'true'}}, env.custom_community_fields)
     assert ! env.custom_community_fields.keys.include?('contact_email')
   end
...	...	@@ -81,7 +81,13 @@ class ContentViewerController < ApplicationController
81	81	end
82	82
83	83	if @page.blog?
84		- @page.filter = {:year => params[:year], :month => params[:month]}
	84	+ posts = if params[:year] and params[:month]
	85	+ filter_date = DateTime.parse("#{params[:year]}-#{params[:month]}-01")
	86	+ @page.posts.by_range(filter_date..Article.last_day_of_month(filter_date))
	87	+ else
	88	+ @page.posts
	89	+ end
	90	+ @posts = available_articles(posts, user).paginate :page => params[:npage], :per_page => @page.posts_per_page
85	91	end
86	92
87	93	if @page.folder? && @page.view_as == 'image_gallery'
...	...
...	...	@@ -11,7 +11,7 @@ module ApplicationHelper
11	11	include BoxesHelper
12	12
13	13	include FormsHelper
14		-
	14	+
15	15	include AssetsHelper
16	16
17	17	include BlockHelper
...	...	@@ -94,7 +94,7 @@ module ApplicationHelper
94	94	if options[:type] == :textile
95	95	content = RedCloth.new(content).to_html
96	96	end
97		-
	97	+
98	98	options[:class] = '' if ! options[:class]
99	99	options[:class] += ' button icon-help' # with-text
100	100
...	...	@@ -269,7 +269,7 @@ module ApplicationHelper
269	269	if klass.nil?
270	270	raise ArgumentError, 'No partial for object. Is there a partial for any class in the inheritance hierarchy?'
271	271	end
272		-
	272	+
273	273	name = klass.name.underscore
274	274	if File.exists?(File.join(RAILS_ROOT, 'app', 'views', params[:controller], "_#{name}.rhtml"))
275	275	name
...	...	@@ -285,7 +285,7 @@ module ApplicationHelper
285	285	# DEPRECATED. Do not use this.
286	286	def stylesheet_import(*sources)
287	287	options = sources.last.is_a?(Hash) ? sources.pop : { }
288		- themed_source = options.delete(:themed_source)
	288	+ themed_source = options.delete(:themed_source)
289	289	content_tag(
290	290	'style',
291	291	"\n" +
...	...	@@ -299,7 +299,7 @@ module ApplicationHelper
299	299	end.join(),
300	300	{ "type" => "text/css" }.merge(options)
301	301	)
302		- end
	302	+ end
303	303
304	304	# DEPRECATED. Do not use this.
305	305	def filename_for_stylesheet(name, in_theme)
...	...	@@ -391,7 +391,7 @@ module ApplicationHelper
391	391	Theme.find(current_theme).owner.identifier
392	392	end
393	393
394		- # generates a image tag for the profile.
	394	+ # generates a image tag for the profile.
395	395	#
396	396	# If the profile has no image set yet, then a default image is used.
397	397	def profile_image(profile, size=:portrait, opt={})
...	...	@@ -787,8 +787,9 @@ module ApplicationHelper
787	787	field_html \|\|= ''
788	788	field_html += capture(&block)
789	789	end
790		- if (controller.action_name == 'signup')
791		- if profile.signup_fields.include?(name) \|\| profile.required_fields.include?(name)
	790	+
	791	+ if controller.action_name == 'signup' \|\| controller.action_name == 'new_community' \|\| (controller.controller_name == "enterprise_registration" && controller.action_name == 'index')
	792	+ if profile.signup_fields.include?(name)
792	793	result = field_html
793	794	end
794	795	else
...	...	@@ -796,6 +797,7 @@ module ApplicationHelper
796	797	result = field_html
797	798	end
798	799	end
	800	+
799	801	if is_required
800	802	result = required(result)
801	803	end
...	...	@@ -943,8 +945,9 @@ module ApplicationHelper
943	945	content_for(:head) { stylesheet_link_tag(*args) }
944	946	end
945	947
946		- def article_to_html(article)
947		- content = article.to_html(:page => params[:npage])
	948	+ def article_to_html(article, options = {})
	949	+ options.merge(:page => params[:npage])
	950	+ content = article.to_html(options)
948	951	return self.instance_eval(&content) if content.kind_of?(Proc)
949	952	content
950	953	end
...	...
...	...	@@ -14,7 +14,7 @@ module BlogHelper
14	14	_('Edit blog')
15	15	end
16	16
17		- def list_posts(user, articles, format = 'full')
	17	+ def list_posts(articles, format = 'full')
18	18	pagination = will_paginate(articles, {
19	19	:param_name => 'npage',
20	20	:prev_label => _('« Newer posts'),
...	...	@@ -25,18 +25,16 @@ module BlogHelper
25	25	articles.each_with_index{ \|art,i\|
26	26	css_add = [ 'position-'+(i+1).to_s() ]
27	27	position = (i%2 == 0) ? 'odd-post' : 'even-post'
28		- if art.published? \|\| (user==art.profile)
29		- css_add << 'first' if i == 0
30		- css_add << 'last' if i == (artic_len-1)
31		- css_add << 'not-published' if !art.published?
32		- css_add << position + '-inner'
33		- content << content_tag('div',
34		- content_tag('div',
35		- display_post(art, format) + '<br style="clear:both"/>',
36		- :class => 'blog-post ' + css_add.join(' '),
37		- :id => "post-#{art.id}"), :class => position
38		- )
39		- end
	28	+ css_add << 'first' if i == 0
	29	+ css_add << 'last' if i == (artic_len-1)
	30	+ css_add << 'not-published' if !art.published?
	31	+ css_add << position + '-inner'
	32	+ content << content_tag('div',
	33	+ content_tag('div',
	34	+ display_post(art, format) + '<br style="clear:both"/>',
	35	+ :class => 'blog-post ' + css_add.join(' '),
	36	+ :id => "post-#{art.id}"), :class => position
	37	+ )
40	38	}
41	39	content.join("\n<hr class='sep-posts'/>\n") + (pagination or '')
42	40	end
...	...
...	...	@@ -32,6 +32,23 @@ class Article < ActiveRecord::Base
32	32	{:include => 'categories', :conditions => { 'categories.id' => category.id }}
33	33	}
34	34
	35	+ named_scope :by_range, lambda { \|range\| {
	36	+ :conditions => [
	37	+ 'published_at BETWEEN :start_date AND :end_date', { :start_date => range.first, :end_date => range.last }
	38	+ ]
	39	+ }}
	40	+
	41	+ def self.first_day_of_month(date)
	42	+ date \|\|= Date.today
	43	+ Date.new(date.year, date.month, 1)
	44	+ end
	45	+
	46	+ def self.last_day_of_month(date)
	47	+ date \|\|= Date.today
	48	+ date >>= 1
	49	+ Date.new(date.year, date.month, 1) - 1.day
	50	+ end
	51	+
35	52	URL_FORMAT = /\A(http\|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)\.[a-z]{2,5}(([0-9]{1,5})?\/.)?\Z/ix
36	53
37	54	validates_format_of :external_link, :with => URL_FORMAT, :if => lambda { \|article\| !article.external_link.blank? }
...	...
...	...	@@ -12,7 +12,7 @@ class ArticleBlock < Block
12	12	block = self
13	13	lambda do
14	14	block_title(block.title) +
15		- (block.article ? article_to_html(block.article) : _('Article not selected yet.'))
	15	+ (block.article ? article_to_html(block.article, :gallery_view => false) : _('Article not selected yet.'))
16	16	end
17	17	end
18	18
...	...
...	...	@@ -3,7 +3,6 @@ class Blog < Folder
3	3	has_many :posts, :class_name => 'Article', :foreign_key => 'parent_id', :source => :children, :conditions => [ 'type != ?', 'RssFeed' ], :order => 'published_at DESC, id DESC'
4	4
5	5	attr_accessor :feed_attrs
6		- attr_accessor :filter
7	6
8	7	after_create do \|blog\|
9	8	blog.children << RssFeed.new(:name => 'feed', :profile => blog.profile)
...	...	@@ -23,7 +22,9 @@ class Blog < Folder
23	22	# FIXME isn't this too much including just to be able to generate some HTML?
24	23	include ActionView::Helpers::TagHelper
25	24	def to_html(options = {})
26		- posts_list(options[:page])
	25	+ lambda do
	26	+ render :file => 'content_viewer/blog_page'
	27	+ end
27	28	end
28	29
29	30	def folder?
...	...	@@ -49,19 +50,6 @@ class Blog < Folder
49	50	self.feed
50	51	end
51	52
52		- def posts_list(npage)
53		- article = self
54		- children = if filter and filter[:year] and filter[:month]
55		- filter_date = DateTime.parse("#{filter[:year]}-#{filter[:month]}-01")
56		- posts.paginate :page => npage, :per_page => posts_per_page, :conditions => [ 'published_at between ? and ?', filter_date, filter_date + 1.month - 1.day ]
57		- else
58		- posts.paginate :page => npage, :per_page => posts_per_page
59		- end
60		- lambda do
61		- render :file => 'content_viewer/blog_page', :locals => {:article => article, :children => children}
62		- end
63		- end
64		-
65	53	has_one :external_feed, :foreign_key => 'blog_id', :dependent => :destroy
66	54
67	55	attr_accessor :external_feed_data
...	...
...	...	@@ -5,7 +5,7 @@ class ChangePassword < Task
5	5	self[:data] \|\|= {}
6	6	end
7	7
8		- attr_accessor :login, :email, :password, :password_confirmation
	8	+ attr_accessor :login, :email, :password, :password_confirmation, :environment_id
9	9
10	10	def self.human_attribute_name(attrib)
11	11	case attrib.to_sym
...	...	@@ -25,15 +25,15 @@ class ChangePassword < Task
25	25	###################################################
26	26	# validations for creating a ChangePassword task
27	27
28		- validates_presence_of :login, :email, :on => :create
	28	+ validates_presence_of :login, :email, :environment_id, :on => :create
29	29
30	30	validates_presence_of :requestor_id
31	31
32	32	validates_format_of :email, :on => :create, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda { \|obj\| !obj.email.blank? })
33	33
34	34	validates_each :login, :on => :create do \|data,attr,value\|
35		- unless data.login.blank?
36		- user = User.find_by_login(data.login)
	35	+ unless data.login.blank? \|\| data.email.blank?
	36	+ user = User.find_by_login_and_environment_id(data.login, data.environment_id)
37	37	if user.nil?
38	38	data.errors.add(:login, _('%{fn} is not a valid username.'))
39	39	else
...	...
...	...	@@ -23,10 +23,6 @@ class Community < Organization
23	23	xss_terminate :only => [ :name, :address, :contact_phone, :description ], :on => 'validation'
24	24
25	25	FIELDS = %w[
26		- city
27		- state
28		- country
29		- zip_code
30	26	language
31	27	]
32	28
...	...	@@ -38,7 +34,7 @@ class Community < Organization
38	34	super
39	35	self.required_fields.each do \|field\|
40	36	if self.send(field).blank?
41		- self.errors.add(field, _('%{fn} is mandatory'))
	37	+ self.errors.add(field, _('%{fn} can\'t be blank'))
42	38	end
43	39	end
44	40	end
...	...	@@ -51,6 +47,10 @@ class Community < Organization
51	47	environment ? environment.required_community_fields : []
52	48	end
53	49
	50	+ def signup_fields
	51	+ environment ? environment.signup_community_fields : []
	52	+ end
	53	+
54	54	def name=(value)
55	55	super(value)
56	56	self.identifier = value.to_slug
...	...
...	...	@@ -14,7 +14,7 @@ class CreateCommunity < Task
14	14
15	15	acts_as_having_image
16	16
17		- DATA_FIELDS = Community.fields + ['name', 'closed', 'tag_list']
	17	+ DATA_FIELDS = Community.fields + ['name', 'closed']
18	18
19	19	DATA_FIELDS.each do \|field\|
20	20	# getter
...	...	@@ -30,7 +30,7 @@ class CreateCommunity < Task
30	30	def validate
31	31	self.environment.required_community_fields.each do \|field\|
32	32	if self.send(field).blank?
33		- self.errors.add(field, _('%{fn} is mandatory'))
	33	+ self.errors.add(field, _('%{fn} can\'t be blank'))
34	34	end
35	35	end
36	36	end
...	...
...	...	@@ -106,6 +106,10 @@ class CreateEnterprise < Task
106	106	environment ? environment.required_enterprise_fields : []
107	107	end
108	108
	109	+ def signup_fields
	110	+ environment ? environment.signup_enterprise_fields : []
	111	+ end
	112	+
109	113	def community?
110	114	false
111	115	end
...	...