Merge branch 'stable'

Conflicts: app/views/profile_editor/_organization.rhtml features/support/selenium.rb

Merge branch 'stable'
Conflicts: app/views/profile_editor/_organization.rhtml features/support/selenium.rb
Antonio Terceiro
2 parents 35984ff4 b66e8d1e
Showing 22 changed files with 554 additions and 9 deletions Show diff stats
app/controllers/application.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/tasks_controller.rb
app/controllers/public/profile_controller.rb
app/models/approve_article.rb
app/models/product.rb
app/models/profile.rb
app/views/blocks/profile_info_actions/enterprise.rhtml
app/views/cms/publish.rhtml
app/views/profile_editor/_organization.rhtml
app/views/shared/access_denied.rhtml
config/bashrc
features/activate_enterprise.feature
features/change_organization_name.feature
features/publish_article.feature
features/step_definitions/activate_enterprise_steps.rb
features/step_definitions/noosfero_steps.rb
features/support/selenium.rb
lib/noosfero.rb
script/git-upgrade
@@ -124,9 +124,10 @@ class ApplicationController &lt; ActionController::Base
     render :template => 'shared/not_found.rhtml', :status => 404
   end
-  def render_access_denied(message = nil)
+  def render_access_denied(message = nil, title = nil)
     @no_design_blocks = true
     @message = message
+    @title = title
     render :template => 'shared/access_denied.rhtml', :status => 403
   end
@@ -222,11 +222,18 @@ class CmsController &lt; MyProfileController
       end
     end.compact unless params[:marked_groups].nil?
     if request.post?
+      @failed = {}
       @marked_groups.each do |item|
         task = ApproveArticle.create!(:article => @article, :name => item[:name], :target => item[:group], :requestor => profile)
-        task.finish unless item[:group].moderated_articles?
+        begin
+          task.finish unless item[:group].moderated_articles?
+        rescue Exception => ex
+           @failed[ex.clean_message] ? @failed[ex.clean_message] << item[:group].name : @failed[ex.clean_message] = [item[:group].name]
+        end
+      end
+      if @failed.blank?
+        redirect_back
       end
-      redirect_back
     end
   end
@@ -17,7 +17,11 @@ class TasksController &lt; MyProfileController
     if request.post? && VALID_DECISIONS.include?(decision) && params[:id]
       task = profile.find_in_all_tasks(params[:id])
       task.update_attributes!(params[:task])
-      task.send(decision)
+      begin
+        task.send(decision)
+      rescue Exception => ex
+        flash[:notice] = ex.clean_message
+      end
     end
     redirect_to :action => 'index'
   end
@@ -107,7 +107,7 @@ class ProfileController &lt; PublicController
   def check_access_to_profile
     unless profile.display_info_to?(user)
-      render :action => 'private_profile', :status => 403, :layout => false
+      render_access_denied(_("Sorry, this profile was defined as private by its owner. You'll not be able to view content here unless the profile owner adds you."), _("Oops ... you cannot go ahead here"))
     end
   end
@@ -64,7 +64,7 @@ class ApproveArticle &lt; Task
   end
   def perform
-    PublishedArticle.create(:name => name, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted)
+    PublishedArticle.create!(:name => name, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted)
   end
   def target_notification_message
@@ -67,4 +67,36 @@ class Product &lt; ActiveRecord::Base
     enterprise.public_profile
   end
+  def price=(value)
+    if value.is_a?(String)
+      super(currency_to_float(value))
+    else
+      super(value)
+    end
+  end
+
+  def currency_to_float( num )
+    if num.count('.') == 1 && num.count(',') == 0
+      # number like "12.34"
+      return num.to_f
+    end
+
+    if num.count('.') == 0 && num.count(',') == 1
+      # number like "12,34"
+      return num.tr(',','.').to_f
+    end
+
+    if num.count('.') > 0 && num.count(',') > 0
+      # number like "12.345.678,90" or "12,345,678.90"
+      dec_sep = num.tr('0-9','')[-1].chr
+      return num.tr('^0-9'+dec_sep,'').tr(dec_sep,'.').to_f
+    end
+
+    # if you are here is because there is only one
+    # separator and this appears 2 times or more.
+    # number like "12.345.678" or "12,345,678"
+
+    return num.tr(',.','').to_f
+  end
+
 end
@@ -264,6 +264,7 @@ class Profile &lt; ActiveRecord::Base
     # copy interesting attributes
     self.layout_template = template.layout_template
+    self.theme = template.theme
     self.custom_footer = template[:custom_footer]
     self.custom_header = template[:custom_header]
@@ -5,6 +5,6 @@
     <% end %>
   <% end %>
   <% if profile.enable_contact? %>
-    <li> <%= link_to content_tag('span', _('Contact us')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, :class => 'button with-text icon-menu-mail' %> </li>
+    <li> <%= link_to content_tag('span', _('Contact us')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, {:id => 'enterprise-contact-button', :class => 'button with-text icon-menu-mail'} %> </li>
   <% end %>
 </ul>
 <h1><%= _('Select the groups where you want to publish your article') %></h1>
+<% if !@failed.blank? %>
+  <div class="errorExplanation" id="errorExplanation">
+    <p><%=_("There were errors with the following communities: ")%></p>
+    <% @failed.each do |error, communities|%>
+      <strong> <%= error %>: </strong>
+      <ul>
+        <% communities.each do |community| %>
+            <li> <%= community %> </li>
+        <% end %>
+      </ul>
+    <% end %>
+  </div>
+<% end %>
+
 <% form_tag do%>
  <%= hidden_field_tag :back_to, @back_to %>
  <% @groups.each do |group| %>
@@ -2,6 +2,18 @@
   <%= required_fields_message if @profile.required_fields.any? %>
+  <%= required f.text_field(:name) %>
+
+<% if @environment.enabled?('enable_organization_url_change') %>
+  <script type="text/javascript">
+    function updateUrlField(name_field, id) {
+      url_field = $(id);
+      url_field.value = convToValidIdentifier(name_field.value, "-");
+      warn_value_change(url_field);
+    }
+  </script>
+<% end %>
+
 <div class="formfieldline">
   <label class="formlabel" for="profile_data_nickname"><%= _('Display name') %></label>
   <div class="formfield type-text">
 <div id='access-denied'>
-  <h1> <%= _('Access denied') %> </h1>
+  <h1> <%= @title || _('Access denied') %> </h1>
   <% unless @message.nil? %>
     <p><%= @message %></p>
@@ -0,0 +1,2 @@
+export PS1="[Noosfero upgrade] (\w) $ "
+eval `dircolors -b`
@@ -0,0 +1,134 @@
+Feature: activate enterprise
+  As an enterprise owner
+  I want to activate my enterprise
+  In order to publish content
+
+  Background:
+    Given the following users
+      | login | name |
+      | joaosilva | Joao Silva |
+
+  Scenario: added an unexistent code
+    Given feature "enterprise_activation" is enabled on environment
+    And I am logged in as "joaosilva"
+    And I am on Joao Silva's control panel
+    And I fill in "Enterprise activation code" with "abcde"
+    When I press "Activate"
+    Then I should see "Invalid enterprise code"
+
+  Scenario: added a code from an activated enterprise
+    Given feature "enterprise_activation" is enabled on environment
+    And the following enterprises
+      | identifier | name | enabled |
+      | products-factory | Products Factory | false |
+    And I am logged in as "joaosilva"
+    And I am on Joao Silva's control panel
+    And enterprise "Products Factory" is enabled
+    And I fill in "Enterprise activation code" with code of "Products Factory"
+    When I press "Activate"
+    Then I should see "This enterprise is already active"
+
+  Scenario: added a code from an enterprise with no foundation year or cnpj
+    Given feature "enterprise_activation" is enabled on environment
+    And the following enterprises
+      | identifier | name | enabled |
+      | products-factory | Products Factory | false |
+    And I am logged in as "joaosilva"
+    And I am on Joao Silva's control panel
+    And I fill in "Enterprise activation code" with code of "Products Factory"
+    When I press "Activate"
+    Then I should see "We don't have enough information about your enterprise to identify you."
+    And enterprise "Products Factory" should not be blocked
+
+  Scenario: filled activation question with wrong foundation year
+    Given feature "enterprise_activation" is enabled on environment
+    And the following enterprises
+      | identifier | name | enabled | foundation_year |
+      | services-provider | Services Provider | false | 2000 |
+    And I am logged in as "joaosilva"
+    And I am on Joao Silva's control panel
+    And I fill in "Enterprise activation code" with code of "Services Provider"
+    And I press "Activate"
+    And I fill in "What year your enterprise was founded? It must have 4 digits, eg 1990." with "1999"
+    When I press "Continue"
+    Then I should see "There was a failed atempt of activation and the automated activation was disabled for your security."
+    And enterprise "Services Provider" should be blocked
+
+  Scenario: filled activation question with wrong cnpj
+    Given feature "enterprise_activation" is enabled on environment
+    And the following enterprises
+      | identifier | name | enabled | cnpj |
+      | services-provider | Services Provider | false | 00000000000000 |
+    And I am logged in as "joaosilva"
+    And I am on Joao Silva's control panel
+    And I fill in "Enterprise activation code" with code of "Services Provider"
+    And I press "Activate"
+    And I fill in "What is the CNPJ of your enterprise?" with "12345678912345"
+    When I press "Continue"
+    Then I should see "There was a failed atempt of activation and the automated activation was disabled for your security."
+    And enterprise "Services Provider" should be blocked
+
+  @selenium
+  Scenario: activate succesffuly an enterprise with foundation_year
+    Given feature "enterprise_activation" is enabled on environment
+    And the following enterprises
+      | identifier | name | enabled | foundation_year |
+      | services-provider | Services Provider | false | 2000 |
+    And I am logged in as "joaosilva"
+    And I am on Joao Silva's control panel
+    And I fill in "Enterprise activation code" with code of "Services Provider"
+    And I press "Activate"
+    And I fill in "enterprise-activation-answer" with "2000"
+    And I press "Continue"
+    And I check "I read the terms of use and accepted them"
+    When I press "Continue"
+    Then I should see "Services Provider was successfuly activated. Now you may go to your control panel or to the control panel of your enterprise"
+    And enterprise "Services Provider" should be enabled
+    And "Joao Silva" is admin of "Services Provider"
+
+  @selenium
+  Scenario: replace template after enable an enterprise
+    Given enterprise template must be replaced after enable
+    And feature "enterprise_activation" is enabled on environment
+    And the following enterprises
+      | identifier | name | enabled | foundation_year |
+      | services-provider | Services Provider | false | 2000 |
+      | active-template | Active Template | false | 2000 |
+    And "Active Template" is the active enterprise template
+    And "Services Provider" doesnt have "Active Template" as template
+    And I am logged in as "joaosilva"
+    And I am on Joao Silva's control panel
+    And I fill in "Enterprise activation code" with code of "Services Provider"
+    And I press "Activate"
+    And I fill in "enterprise-activation-answer" with "2000"
+    And I press "Continue"
+    And I check "I read the terms of use and accepted them"
+    When I press "Continue"
+    Then I should see "Services Provider was successfuly activated. Now you may go to your control panel or to the control panel of your enterprise"
+    And enterprise "Services Provider" should be enabled
+    And "Joao Silva" is admin of "Services Provider"
+    And "Services Provider" has "Active Template" as template
+
+  @selenium
+  Scenario: not replace template after enable an enterprise
+    Given enterprise template must not be replaced after enable
+    And feature "enterprise_activation" is enabled on environment
+    And the following enterprises
+      | identifier | name | enabled | foundation_year |
+      | services-provider | Services Provider | false | 2000 |
+      | active-template | Active Template | false | 2000 |
+    And "Active Template" is the active enterprise template
+    And "Services Provider" doesnt have "Active Template" as template
+    And I am logged in as "joaosilva"
+    And I am on Joao Silva's control panel
+    And I fill in "Enterprise activation code" with code of "Services Provider"
+    And I press "Activate"
+    And I fill in "enterprise-activation-answer" with "2000"
+    And I press "Continue"
+    And I check "I read the terms of use and accepted them"
+    When I press "Continue"
+    Then I should see "Services Provider was successfuly activated. Now you may go to your control panel or to the control panel of your enterprise"
+    And enterprise "Services Provider" should be enabled
+    And "Joao Silva" is admin of "Services Provider"
+    And "Services Provider" doesnt have "Active Template" as template
+
@@ -0,0 +1,35 @@
+Feature: change organization name
+  As an organization's admin
+  I want to change it's name
+  In order to keep it's name consistent
+
+  Scenario: changing community's name
+    Given the following communities
+      | identifier | name |
+      | sample-community | Sample Community |
+    And the following users
+      | login | name |
+      | joaosilva | Joao Silva |
+    And "Joao Silva" is admin of "Sample Community"
+    And I am logged in as "joaosilva"
+    And I am on Sample Community's control panel
+    And I follow "Community Info and settings"
+    And I fill in "Name" with "New Sample Community"
+    When I press "Save"
+    Then I should be on New Sample Community's control panel
+
+
+  Scenario: changing enterprise's name
+    Given the following enterprises
+      | identifier | name |
+      | sample-enterprise | Sample Enterprise |
+    And the following users
+      | login | name |
+      | joaosilva | Joao Silva |
+    And "Joao Silva" is admin of "Sample Enterprise"
+    And I am logged in as "joaosilva"
+    And I am on Sample Enterprise's control panel
+    And I follow "Enterprise Info and settings"
+    And I fill in "Name" with "New Sample Enterprise"
+    When I press "Save"
+    Then I should be on New Sample Enterprise's control panel
@@ -0,0 +1,111 @@
+Feature: publish article
+  As a user
+  I want to publish an article
+  In order to share it with other users
+
+  Background:
+    Given the following users
+      | login | name |
+      | joaosilva | Joao Silva |
+      | mariasilva | Maria Silva |
+    And "mariasilva" has no articles
+    And "joaosilva" has no articles
+    And the following communities
+      | identifier | name |
+      | sample-community | Sample Community |
+    And the following articles
+      | owner | name | body |
+      | joaosilva | Sample Article | This is the first published article |
+
+  Scenario: publishing an article that doesn't exists in the community
+    Given I am logged in as "joaosilva"
+    And "Joao Silva" is a member of "Sample Community"
+    And I am on Joao Silva's control panel
+    And I follow "Manage Content"
+    And I follow "Spread"
+    And I check "Sample Community"
+    And I press "Publish"
+    And I am on Sample Community's homepage
+    And I follow "View profile"
+    And I follow "Site map"
+    When I follow "Sample Article"
+    Then I should see "This is the first published article"
+
+
+  Scenario: getting an error message when publishing article with same name
+    Given I am logged in as "joaosilva"
+    And "Joao Silva" is a member of "Sample Community"
+    And I am on Joao Silva's control panel
+    And I follow "Manage Content"
+    And I follow "Spread"
+    And I check "Sample Community"
+    And I press "Publish"
+    And I am logged in as "mariasilva"
+    And "Maria Silva" is a member of "Sample Community"
+    And I am on Maria Silva's control panel
+    And I follow "Manage Content"
+    And I follow "New article"
+    And I follow "Text article with Textile markup language"
+    And I fill in the following:
+      | Title | Sample Article |
+      | Text | this is Maria's first published article |
+    And I press "Save"
+    And I follow "Spread"
+    And I check "Sample Community"
+    When I press "Publish"
+    Then I should see "Validation failed: Slug (the code generated from the article name) is already being used by another article.:"
+
+  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.
+    Given the following communities
+      | identifier | name |
+      | another-community1 | Another Community1 |
+      | another-community2 | Another Community2 |
+    And I am logged in as "joaosilva"
+    And "Joao Silva" is a member of "Sample Community"
+    And "Joao Silva" is a member of "Another Community1"
+    And "Joao Silva" is a member of "Another Community2"
+    And I am on Joao Silva's control panel
+    And I follow "Manage Content"
+    And I follow "Spread"
+    And I check "Sample Community"
+    And I press "Publish"
+    And I should not see "This article name is already in use in the following community(ies):"
+    And I follow "Spread"
+    And I check "Sample Community"
+    And I check "Another Community1"
+    And I check "Another Community2"
+    When I press "Publish"
+    Then I should see "Validation failed: Slug (the code generated from the article name) is already being used by another article.:"
+    And I am on Another Community1's homepage
+    And I follow "View profile"
+    When I follow "Site map"
+    Then I should see "Sample Article"
+    And I am on Another Community2's homepage
+    And I follow "View profile"
+    When I follow "Site map"
+    Then I should see "Sample Article"
+
+  Scenario: publishing articles with the same name in a moderated community
+    Given I am logged in as "joaosilva"
+    And "Joao Silva" is a member of "Sample Community"
+    And "Joao Silva" is admin of "Sample Community"
+    And I am on Sample Community's control panel
+    And I follow "Community Info and settings"
+    And I choose "profile_data_moderated_articles_true"
+    And I press "Save"
+    And I am on Joao Silva's control panel
+    And I follow "Manage Content"
+    And I follow "Spread"
+    And I check "Sample Community"
+    And I press "Publish"
+    And I follow "Spread"
+    And I check "Sample Community"
+    And I press "Publish"
+    And I am on Sample Community's control panel
+    And I follow "Tasks"
+    And I press "Ok!"
+    And I should not see "Validation failed: Slug (the code generated from the article name) is already being used by another article.:"
+    When I press "Ok!"
+    Then I should see "Validation failed: Slug (the code generated from the article name) is already being used by another article."
+
@@ -0,0 +1,69 @@
+Given /^I fill in "([^\"]*)" with code of "([^\"]*)"$/ do |field, enterprise|
+  enterprise = Enterprise.find_by_name(enterprise)
+  value = EnterpriseActivation.all.select { |task| task.enterprise == enterprise}.first.code
+  fill_in(field, :with => value)
+end
+
+Given /^enterprise "([^\"]*)" should be enabled$/ do |enterprise|
+  Enterprise.find_by_name(enterprise).enabled?.should be_true
+end
+
+Given /^"([^\"]*)" is the active enterprise template$/ do |enterprise|
+  template = Enterprise.find_by_name(enterprise)
+  template.boxes.destroy_all
+  template.boxes << Box.new
+  template.layout_template = 'leftbar'
+  template.theme = 'template_theme'
+  template.custom_header = 'template header'
+  template.custom_footer = 'template_footer'
+  template.save!
+
+  e = Environment.default
+  e.enterprise_template = template
+  e.save
+end
+
+Given /^"([^\"]*)" has "([^\"]*)" as template$/ do |ent, templ|
+  template = Enterprise.find_by_name(templ)
+  enterprise = Enterprise.find_by_name(ent)
+  (template.boxes.size == enterprise.boxes.size).should be_true
+  (template.layout_template == enterprise.layout_template).should be_true
+  (template.theme == enterprise.theme).should be_true
+  (template.custom_header == enterprise.custom_header).should be_true
+  (template.custom_footer == enterprise.custom_footer).should be_true
+end
+
+Given /^"([^\"]*)" doesnt have "([^\"]*)" as template$/ do |ent, templ|
+  template = Enterprise.find_by_name(templ)
+  enterprise = Enterprise.find_by_name(ent)
+  (template.boxes.size == enterprise.boxes.size).should be_false
+  (template.layout_template == enterprise.layout_template).should be_false
+  (template.theme == enterprise.theme).should be_false
+  (template.custom_header == enterprise.custom_header).should be_false
+  (template.custom_footer == enterprise.custom_footer).should be_false
+end
+
+Given /^enterprise "([^\"]*)" is enabled$/ do |enterprise|
+  Enterprise.find_by_name(enterprise).update_attribute(:enabled,true)
+  Enterprise.find_by_name(enterprise).enabled?.should be_true
+end
+
+Given /^enterprise "([^\"]*)" should be blocked$/ do |enterprise|
+   Enterprise.find_by_name(enterprise).blocked?.should be_true
+end
+
+Given /^enterprise "([^\"]*)" should not be blocked$/ do |enterprise|
+  Enterprise.find_by_name(enterprise).blocked?.should_not be_true
+end
+
+Given /^enterprise template must be replaced after enable$/ do
+  e = Environment.default
+  e.replace_enterprise_template_when_enable = true
+  e.save
+end
+
+Given /^enterprise template must not be replaced after enable$/ do
+  e = Environment.default
+  e.replace_enterprise_template_when_enable = false
+  e.save
+end
@@ -94,6 +94,20 @@ Given /^feature &quot;(.+)&quot; is disabled on environment$/ do |feature|
    e.save
 end
+Given /^"(.+)" is a member of "(.+)"$/ do |person,profile|
+  Profile.find_by_name(profile).add_member(Profile.find_by_name(person))
+end
+
 Given /^"(.+)" should be a member of "(.+)"$/ do |person,profile|
   Profile.find_by_name(profile).members.should include(Person.find_by_name(person))
 end
+
+Given /^"(.+)" is admin of "(.+)"$/ do |person, organization|
+  org = Profile.find_by_name(organization)
+  user = Profile.find_by_name(person)
+  org.add_admin(user)
+end
+
+Given /^"([^\"]*)" has no articles$/ do |profile|
+  (Profile[profile] || Profile.find_by_name(profile)).articles.delete_all
+end
@@ -15,6 +15,7 @@ Before do
   fixtures_folder = File.join(RAILS_ROOT, 'test', 'fixtures')
   fixtures = ['environments', 'roles']
   Fixtures.create_fixtures(fixtures_folder, fixtures)
+  ENV['LANG'] = 'C'
   DatabaseCleaner.start
 end
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.20.0'
+  VERSION = '0.20.2'
   SVN_ROOT = 'https://svn.colivre.coop.br/svn/noosfero'
   def self.pattern_for_controllers_in_directory(dir)
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+set -e
+
+export RAILS_ENV=production
+
+get_value(){
+  ruby -ryaml -e "puts YAML.load_file('config/database.yml')['$RAILS_ENV']['$1']"
+}
+
+usage(){
+  echo "usage: $0 [OPTIONS]"
+  echo
+  echo "Options:"
+  echo
+  echo "  -s, --shell     Opens a shell just after upgrading code and"
+  echo "                  database to make manual steps if needed"
+  echo
+  echo "  -h, --help      Displays the help (this screen)"
+  echo
+  echo "  -v, --version   Displays Noosfero current version"
+  echo
+  exit $1
+}
+
+version(){
+  version=$(ruby -Ilib -rnoosfero -e 'puts Noosfero::VERSION')
+  echo "Noosfero version $version"
+  exit 0
+}
+
+shell=no
+while test $# -gt 0; do
+  case "$1" in
+    --shell)
+      shell=yes
+      ;;
+    --help)
+      usage 0
+      ;;
+    --version)
+      version
+      ;;
+    *)
+      usage 1
+      ;;
+  esac
+  shift
+done
+
+
+./script/production stop || echo "Stop failed, trying to continue anyway"
+
+sudo /etc/init.d/memcached restart
+
+rake backup
+
+database=$(get_value database)
+adapter=$(get_value adapter)
+
+if [ "$adapter" = "postgresql" ]; then
+  mkdir -p backups/
+  backup=backups/dump-$(date +%Y-%m-%d-%H-%M).sql
+  pg_dump "$database" > "$backup"
+fi
+
+git pull
+
+for dir in public/designs/themes/*; do
+  (cd $dir && test -e .git/config && git pull)
+done
+
+rake db:migrate
+
+if test "$shell" = "yes"; then
+  echo "################################################"
+  echo "# Noosfero upgrade shell                       #"
+  echo "################################################"
+  echo "#                                              #"
+  echo "# If you need to do any manual steps during    #"
+  echo "# this upgrade, now is the time.               #"
+  echo "#                                              #"
+  echo "# After you finish, just exit this shell and   #"
+  echo "# the upgrade will proceed                     #"
+  echo "################################################"
+  export PS1="[Noosfero upgrade] $PS1"
+  bash --rcfile config/bashrc
+fi
+
+rake makemo
+
+./script/production start
@@ -41,6 +41,7 @@ profile_admin:
   system: true
   permissions:
    - edit_profile_design
+   - edit_profile
    - moderate_comments
    - destroy_profile
    - perform_task
@@ -178,4 +178,19 @@ class ProductTest &lt; Test::Unit::TestCase
     assert !p1.public?
   end
+  should 'accept prices in american\'s or brazilian\'s currency format' do
+    [
+      [12.34, 12.34],
+      ["12.34", 12.34],
+      ["12,34", 12.34],
+      ["12.345.678,90", 12345678.90],
+      ["12,345,678.90", 12345678.90],
+      ["12.345.678", 12345678.00],
+      ["12,345,678", 12345678.00]
+    ].each do |input, output|
+      product = Product.new(:price => input)
+      assert_equal output, product.price
+    end
+  end
+
 end
	@@ -107,7 +107,7 @@ class ProfileController < PublicController		@@ -107,7 +107,7 @@ class ProfileController < PublicController
107		107
108	def check_access_to_profile	108	def check_access_to_profile
109	unless profile.display_info_to?(user)	109	unless profile.display_info_to?(user)
110	- render :action => 'private_profile', :status => 403, :layout => false	110	+ render_access_denied(_("Sorry, this profile was defined as private by its owner. You'll not be able to view content here unless the profile owner adds you."), _("Oops ... you cannot go ahead here"))
111	end	111	end
112	end	112	end
113		113
	@@ -64,7 +64,7 @@ class ApproveArticle < Task		@@ -64,7 +64,7 @@ class ApproveArticle < Task
64	end	64	end
65		65
66	def perform	66	def perform
67	- PublishedArticle.create(:name => name, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted)	67	+ PublishedArticle.create!(:name => name, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted)
68	end	68	end
69		69
70	def target_notification_message	70	def target_notification_message
	@@ -67,4 +67,36 @@ class Product < ActiveRecord::Base		@@ -67,4 +67,36 @@ class Product < ActiveRecord::Base
67	enterprise.public_profile	67	enterprise.public_profile
68	end	68	end
69		69
		70	+ def price=(value)
		71	+ if value.is_a?(String)
		72	+ super(currency_to_float(value))
		73	+ else
		74	+ super(value)
		75	+ end
		76	+ end
		77	+
		78	+ def currency_to_float( num )
		79	+ if num.count('.') == 1 && num.count(',') == 0
		80	+ # number like "12.34"
		81	+ return num.to_f
		82	+ end
		83	+
		84	+ if num.count('.') == 0 && num.count(',') == 1
		85	+ # number like "12,34"
		86	+ return num.tr(',','.').to_f
		87	+ end
		88	+
		89	+ if num.count('.') > 0 && num.count(',') > 0
		90	+ # number like "12.345.678,90" or "12,345,678.90"
		91	+ dec_sep = num.tr('0-9','')[-1].chr
		92	+ return num.tr('^0-9'+dec_sep,'').tr(dec_sep,'.').to_f
		93	+ end
		94	+
		95	+ # if you are here is because there is only one
		96	+ # separator and this appears 2 times or more.
		97	+ # number like "12.345.678" or "12,345,678"
		98	+
		99	+ return num.tr(',.','').to_f
		100	+ end
		101	+
70	end	102	end
	@@ -264,6 +264,7 @@ class Profile < ActiveRecord::Base		@@ -264,6 +264,7 @@ class Profile < ActiveRecord::Base
264		264
265	# copy interesting attributes	265	# copy interesting attributes
266	self.layout_template = template.layout_template	266	self.layout_template = template.layout_template
		267	+ self.theme = template.theme
267	self.custom_footer = template[:custom_footer]	268	self.custom_footer = template[:custom_footer]
268	self.custom_header = template[:custom_header]	269	self.custom_header = template[:custom_header]
269		270
	@@ -5,6 +5,6 @@		@@ -5,6 +5,6 @@
5	<% end %>	5	<% end %>
6	<% end %>	6	<% end %>
7	<% if profile.enable_contact? %>	7	<% if profile.enable_contact? %>
8	- <li> <%= link_to content_tag('span', _('Contact us')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, :class => 'button with-text icon-menu-mail' %> </li>	8	+ <li> <%= link_to content_tag('span', _('Contact us')), {:profile => profile.identifier, :controller => 'contact', :action => 'new'}, {:id => 'enterprise-contact-button', :class => 'button with-text icon-menu-mail'} %> </li>
9	<% end %>	9	<% end %>
10	</ul>	10	</ul>
1	<h1><%= _('Select the groups where you want to publish your article') %></h1>	1	<h1><%= _('Select the groups where you want to publish your article') %></h1>
2		2
		3	+<% if !@failed.blank? %>
		4	+ <div class="errorExplanation" id="errorExplanation">
		5	+ <p><%=_("There were errors with the following communities: ")%></p>
		6	+ <% @failed.each do \|error, communities\|%>
		7	+ <strong> <%= error %>: </strong>
		8	+ <ul>
		9	+ <% communities.each do \|community\| %>
		10	+ <li> <%= community %> </li>
		11	+ <% end %>
		12	+ </ul>
		13	+ <% end %>
		14	+ </div>
		15	+<% end %>
		16	+
3	<% form_tag do%>	17	<% form_tag do%>
4	<%= hidden_field_tag :back_to, @back_to %>	18	<%= hidden_field_tag :back_to, @back_to %>
5	<% @groups.each do \|group\| %>	19	<% @groups.each do \|group\| %>
	@@ -2,6 +2,18 @@		@@ -2,6 +2,18 @@
2		2
3	<%= required_fields_message if @profile.required_fields.any? %>	3	<%= required_fields_message if @profile.required_fields.any? %>
4		4
		5	+ <%= required f.text_field(:name) %>
		6	+
		7	+<% if @environment.enabled?('enable_organization_url_change') %>
		8	+ <script type="text/javascript">
		9	+ function updateUrlField(name_field, id) {
		10	+ url_field = $(id);
		11	+ url_field.value = convToValidIdentifier(name_field.value, "-");
		12	+ warn_value_change(url_field);
		13	+ }
		14	+ </script>
		15	+<% end %>
		16	+
5	<div class="formfieldline">	17	<div class="formfieldline">
6	<label class="formlabel" for="profile_data_nickname"><%= _('Display name') %></label>	18	<label class="formlabel" for="profile_data_nickname"><%= _('Display name') %></label>
7	<div class="formfield type-text">	19	<div class="formfield type-text">
1	<div id='access-denied'>	1	<div id='access-denied'>
2		2
3	- <h1> <%= _('Access denied') %> </h1>	3	+ <h1> <%= @title \|\| _('Access denied') %> </h1>
4		4
5	<% unless @message.nil? %>	5	<% unless @message.nil? %>
6	<p><%= @message %></p>	6	<p><%= @message %></p>
@@ -0,0 +1,2 @@		@@ -0,0 +1,2 @@
	1	+export PS1="[Noosfero upgrade] (\w) $ "
	2	+eval `dircolors -b`
@@ -0,0 +1,134 @@		@@ -0,0 +1,134 @@
	1	+Feature: activate enterprise
	2	+ As an enterprise owner
	3	+ I want to activate my enterprise
	4	+ In order to publish content
	5	+
	6	+ Background:
	7	+ Given the following users
	8	+ \| login \| name \|
	9	+ \| joaosilva \| Joao Silva \|
	10	+
	11	+ Scenario: added an unexistent code
	12	+ Given feature "enterprise_activation" is enabled on environment
	13	+ And I am logged in as "joaosilva"
	14	+ And I am on Joao Silva's control panel
	15	+ And I fill in "Enterprise activation code" with "abcde"
	16	+ When I press "Activate"
	17	+ Then I should see "Invalid enterprise code"
	18	+
	19	+ Scenario: added a code from an activated enterprise
	20	+ Given feature "enterprise_activation" is enabled on environment
	21	+ And the following enterprises
	22	+ \| identifier \| name \| enabled \|
	23	+ \| products-factory \| Products Factory \| false \|
	24	+ And I am logged in as "joaosilva"
	25	+ And I am on Joao Silva's control panel
	26	+ And enterprise "Products Factory" is enabled
	27	+ And I fill in "Enterprise activation code" with code of "Products Factory"
	28	+ When I press "Activate"
	29	+ Then I should see "This enterprise is already active"
	30	+
	31	+ Scenario: added a code from an enterprise with no foundation year or cnpj
	32	+ Given feature "enterprise_activation" is enabled on environment
	33	+ And the following enterprises
	34	+ \| identifier \| name \| enabled \|
	35	+ \| products-factory \| Products Factory \| false \|
	36	+ And I am logged in as "joaosilva"
	37	+ And I am on Joao Silva's control panel
	38	+ And I fill in "Enterprise activation code" with code of "Products Factory"
	39	+ When I press "Activate"
	40	+ Then I should see "We don't have enough information about your enterprise to identify you."
	41	+ And enterprise "Products Factory" should not be blocked
	42	+
	43	+ Scenario: filled activation question with wrong foundation year
	44	+ Given feature "enterprise_activation" is enabled on environment
	45	+ And the following enterprises
	46	+ \| identifier \| name \| enabled \| foundation_year \|
	47	+ \| services-provider \| Services Provider \| false \| 2000 \|
	48	+ And I am logged in as "joaosilva"
	49	+ And I am on Joao Silva's control panel
	50	+ And I fill in "Enterprise activation code" with code of "Services Provider"
	51	+ And I press "Activate"
	52	+ And I fill in "What year your enterprise was founded? It must have 4 digits, eg 1990." with "1999"
	53	+ When I press "Continue"
	54	+ Then I should see "There was a failed atempt of activation and the automated activation was disabled for your security."
	55	+ And enterprise "Services Provider" should be blocked
	56	+
	57	+ Scenario: filled activation question with wrong cnpj
	58	+ Given feature "enterprise_activation" is enabled on environment
	59	+ And the following enterprises
	60	+ \| identifier \| name \| enabled \| cnpj \|
	61	+ \| services-provider \| Services Provider \| false \| 00000000000000 \|
	62	+ And I am logged in as "joaosilva"
	63	+ And I am on Joao Silva's control panel
	64	+ And I fill in "Enterprise activation code" with code of "Services Provider"
	65	+ And I press "Activate"
	66	+ And I fill in "What is the CNPJ of your enterprise?" with "12345678912345"
	67	+ When I press "Continue"
	68	+ Then I should see "There was a failed atempt of activation and the automated activation was disabled for your security."
	69	+ And enterprise "Services Provider" should be blocked
	70	+
	71	+ @selenium
	72	+ Scenario: activate succesffuly an enterprise with foundation_year
	73	+ Given feature "enterprise_activation" is enabled on environment
	74	+ And the following enterprises
	75	+ \| identifier \| name \| enabled \| foundation_year \|
	76	+ \| services-provider \| Services Provider \| false \| 2000 \|
	77	+ And I am logged in as "joaosilva"
	78	+ And I am on Joao Silva's control panel
	79	+ And I fill in "Enterprise activation code" with code of "Services Provider"
	80	+ And I press "Activate"
	81	+ And I fill in "enterprise-activation-answer" with "2000"
	82	+ And I press "Continue"
	83	+ And I check "I read the terms of use and accepted them"
	84	+ When I press "Continue"
	85	+ Then I should see "Services Provider was successfuly activated. Now you may go to your control panel or to the control panel of your enterprise"
	86	+ And enterprise "Services Provider" should be enabled
	87	+ And "Joao Silva" is admin of "Services Provider"
	88	+
	89	+ @selenium
	90	+ Scenario: replace template after enable an enterprise
	91	+ Given enterprise template must be replaced after enable
	92	+ And feature "enterprise_activation" is enabled on environment
	93	+ And the following enterprises
	94	+ \| identifier \| name \| enabled \| foundation_year \|
	95	+ \| services-provider \| Services Provider \| false \| 2000 \|
	96	+ \| active-template \| Active Template \| false \| 2000 \|
	97	+ And "Active Template" is the active enterprise template
	98	+ And "Services Provider" doesnt have "Active Template" as template
	99	+ And I am logged in as "joaosilva"
	100	+ And I am on Joao Silva's control panel
	101	+ And I fill in "Enterprise activation code" with code of "Services Provider"
	102	+ And I press "Activate"
	103	+ And I fill in "enterprise-activation-answer" with "2000"
	104	+ And I press "Continue"
	105	+ And I check "I read the terms of use and accepted them"
	106	+ When I press "Continue"
	107	+ Then I should see "Services Provider was successfuly activated. Now you may go to your control panel or to the control panel of your enterprise"
	108	+ And enterprise "Services Provider" should be enabled
	109	+ And "Joao Silva" is admin of "Services Provider"
	110	+ And "Services Provider" has "Active Template" as template
	111	+
	112	+ @selenium
	113	+ Scenario: not replace template after enable an enterprise
	114	+ Given enterprise template must not be replaced after enable
	115	+ And feature "enterprise_activation" is enabled on environment
	116	+ And the following enterprises
	117	+ \| identifier \| name \| enabled \| foundation_year \|
	118	+ \| services-provider \| Services Provider \| false \| 2000 \|
	119	+ \| active-template \| Active Template \| false \| 2000 \|
	120	+ And "Active Template" is the active enterprise template
	121	+ And "Services Provider" doesnt have "Active Template" as template
	122	+ And I am logged in as "joaosilva"
	123	+ And I am on Joao Silva's control panel
	124	+ And I fill in "Enterprise activation code" with code of "Services Provider"
	125	+ And I press "Activate"
	126	+ And I fill in "enterprise-activation-answer" with "2000"
	127	+ And I press "Continue"
	128	+ And I check "I read the terms of use and accepted them"
	129	+ When I press "Continue"
	130	+ Then I should see "Services Provider was successfuly activated. Now you may go to your control panel or to the control panel of your enterprise"
	131	+ And enterprise "Services Provider" should be enabled
	132	+ And "Joao Silva" is admin of "Services Provider"
	133	+ And "Services Provider" doesnt have "Active Template" as template
	134	+