Merge branch 'master' into antispam

Antonio Terceiro
2 parents 5853fd51 a1ac0fb5
Showing 40 changed files with 385 additions and 234 deletions Show diff stats
app/controllers/public/search_controller.rb
app/helpers/application_helper.rb
app/models/article.rb
app/models/input.rb
app/models/location_block.rb
app/models/mailing.rb
app/models/price_detail.rb
app/models/product.rb
app/models/production_cost.rb
app/models/profile.rb
app/models/user.rb
app/views/blocks/location.html.erb
app/views/catalog/index.rhtml
app/views/maps/_google_map.js.erb
app/views/maps/edit_location.rhtml
app/views/profile/_profile_comment_form.rhtml
app/views/profile/_profile_scrap_reply_form.rhtml
app/views/profile/index.rhtml
app/views/search/_product.rhtml
db/migrate/20120813163139_set_activation_code_to_nil_if_already_activated.rb
@@ -243,7 +243,7 @@ class SearchController &lt; PublicController
     @searching = {}
     @titles = {}
     @enabled_searches.each do |key, name|
-      @titles[key] = name
+      @titles[key] = _(name)
       @searching[key] = params[:action] == 'index' || params[:action] == key.to_s
     end
     @names = @titles if @names.nil?
@@ -1094,7 +1094,7 @@ module ApplicationHelper
       {s_('contents|Most commented') => {:href => url_for({:controller => 'search', :action => 'contents', :filter => 'more_comments'})}}
     ]
     if logged_in?
-      links.push(_('New content') => lightbox_options({:href => url_for({:controller => 'cms', :action => 'new', :profile => current_user.login, :cms => true})}))
+      links.push(_('New content') => colorbox_options({:href => url_for({:controller => 'cms', :action => 'new', :profile => current_user.login, :cms => true})}))
     end
     link_to(content_tag(:span, _('Contents'), :class => 'icon-menu-articles'), {:controller => "search", :action => 'contents', :category_path => ''}, :id => 'submenu-contents') +
@@ -1183,6 +1183,10 @@ module ApplicationHelper
     ], :class => 'limited-text-area')
   end
+  def expandable_text_area(object_name, method, text_area_id, options = {})
+    text_area(object_name, method, { :id => text_area_id, :onkeyup => "grow_text_area('#{text_area_id}')" }.merge(options))
+  end
+
   def pluralize_without_count(count, singular, plural = nil)
     count == 1 ? singular : (plural || singular.pluralize)
   end
@@ -54,6 +54,11 @@ class Article &lt; ActiveRecord::Base
     end
   end
+  after_destroy :destroy_activity
+  def destroy_activity
+    self.activity.destroy if self.activity
+  end
+
   xss_terminate :only => [ :name ], :on => 'validation', :with => 'white_list'
   named_scope :in_category, lambda { |category|
@@ -9,6 +9,8 @@ class Input &lt; ActiveRecord::Base
   belongs_to :unit
+  named_scope :relevant_to_price, :conditions => { :relevant_to_price => true }
+
   include FloatHelper
   def price_per_unit=(value)
 class LocationBlock < Block
-  settings_items :zoom, :type => :integer , :default => 4
-  settings_items :map_type, :type => :string , :default => 'roadmap'
+  settings_items :zoom, :type => :integer, :default => 4
+  settings_items :map_type, :type => :string, :default => 'roadmap'
   def self.description
     _('Location map')
@@ -12,18 +12,10 @@ class LocationBlock &lt; Block
   end
   def content(args={})
+    block = self
     profile = self.owner
-    title = self.title
-    if profile.lat
-      block_title(title) +
-      content_tag('div',
-      '<img src="http://maps.google.com/maps/api/staticmap?center=' + profile.lat.to_s() +
-      ',' + profile.lng.to_s() + '&zoom=' + zoom.to_s() +
-      '&size=190x250&maptype=' + map_type + '&markers=' + profile.lat.to_s() + ',' +
-      profile.lng.to_s() + ',green' + '&sensor=false"/>',
-      :class => 'the-localization-map' )
-    else
-      content_tag('i', _('This profile has no geographical position registered.'))
+    lambda do
+      render :file => 'blocks/location', :locals => {:block => block, :profile => profile}
     end
   end
@@ -9,7 +9,11 @@ class Mailing &lt; ActiveRecord::Base
   xss_terminate :only => [ :subject, :body ], :with => 'white_list', :on => 'validation'
   after_create do |mailing|
-    Delayed::Job.enqueue MailingJob.new(mailing.id)
+    mailing.schedule
+  end
+
+  def schedule
+    Delayed::Job.enqueue MailingJob.new(self.id)
   end
   def generate_from
@@ -30,8 +34,14 @@ class Mailing &lt; ActiveRecord::Base
   def deliver
     each_recipient do |recipient|
-      Mailing::Sender.deliver_mail(self, recipient.email)
-      self.mailing_sents.create(:person => recipient)
+      begin
+        Mailing::Sender.deliver_mail(self, recipient.email)
+        self.mailing_sents.create(:person => recipient)
+      rescue Exception
+        # FIXME should not discard errors silently. An idea is to collect all
+        # errors and generate a task (notification) for the +source+
+        # (environment/organization) listing these errors.
+      end
     end
   end
@@ -4,9 +4,13 @@ class PriceDetail &lt; ActiveRecord::Base
   validates_presence_of :product_id
   belongs_to :production_cost
-  validates_presence_of :production_cost_id
+  validates_presence_of :production_cost
   validates_uniqueness_of :production_cost_id, :scope => :product_id
+  def name
+    production_cost.name
+  end
+
   def price
     self[:price] || 0
   end
@@ -158,7 +158,7 @@ class Product &lt; ActiveRecord::Base
   def inputs_cost
     return 0 if inputs.empty?
-    inputs.map(&:cost).inject { |sum,price| sum + price }
+    inputs.relevant_to_price.map(&:cost).inject { |sum,price| sum + price }
   end
   def total_production_cost
@@ -201,6 +201,7 @@ class Product &lt; ActiveRecord::Base
     self.inputs(true).each{ |i| t_i += 1; se_i += 1 if i.is_from_solidarity_economy }
     t_i = 1 if t_i == 0 # avoid division by 0
     p = case (se_i.to_f/t_i)*100
+        when 0 then [0, '']
         when 0..24.999 then [0, _("0%")];
         when 25..49.999 then [25, _("25%")];
         when 50..74.999 then [50, _("50%")];
@@ -5,4 +5,5 @@ class ProductionCost &lt; ActiveRecord::Base
   validates_presence_of :name
   validates_length_of :name, :maximum => 30, :allow_blank => true
   validates_uniqueness_of :name, :scope => [:owner_id, :owner_type]
+
 end
@@ -208,7 +208,7 @@ class Profile &lt; ActiveRecord::Base
   end
   belongs_to :region
-  
+
   def location(separator = ' - ')
     myregion = self.region
     if myregion
@@ -295,12 +295,12 @@ class Profile &lt; ActiveRecord::Base
     true
   end
-  # registar callback for creating boxes after the object is created. 
+  # registar callback for creating boxes after the object is created.
   after_create :create_default_set_of_boxes
   # creates the initial set of boxes when the profile is created. Can be
   # overriden for each subclass to create a custom set of boxes for its
-  # instances.    
+  # instances.
   def create_default_set_of_boxes
     if template
       apply_template(template, :copy_articles => false)
@@ -420,7 +420,7 @@ class Profile &lt; ActiveRecord::Base
   # returns +false+
   def person?
-    self.kind_of?(Person) 
+    self.kind_of?(Person)
   end
   def enterprise?
@@ -528,7 +528,7 @@ private :generate_url, :url_options
   after_create :insert_default_article_set
   def insert_default_article_set
-    if template 
+    if template
       copy_articles_from template
     else
       default_set_of_articles.each do |article|
@@ -598,7 +598,7 @@ private :generate_url, :url_options
       raise _("%s can't have members") % self.class.name
     end
   end
-  
+
   def remove_member(person)
     self.disaffiliate(person, Profile::Roles.all_roles(environment.id))
   end
@@ -895,7 +895,7 @@ private :generate_url, :url_options
   def self.f_enabled_proc(enabled)
     enabled = enabled == "true" ? true : false
-    enabled ? _('Enabled') : _('Not enabled')
+    enabled ? s_('facets|Enabled') : s_('facets|Not enabled')
   end
   def f_enabled
     self.enabled
@@ -924,7 +924,7 @@ private :generate_url, :url_options
   acts_as_searchable :fields => facets_fields_for_solr + [:extra_data_for_index,
       # searched fields
       {:name => {:type => :text, :boost => 2.0}},
-      {:identifier => :text}, {:address => :text}, {:nickname => :text},
+      {:identifier => :text}, {:nickname => :text},
       # filtered fields
       {:public => :boolean}, {:environment_id => :integer},
       {:category_filter => :integer},
@@ -944,7 +944,7 @@ private :generate_url, :url_options
   def control_panel_settings_button
     {:title => _('Profile Info and settings'), :icon => 'edit-profile'}
-  end 
+  end
   def followed_by?(person)
     person.is_member_of?(self)
@@ -21,12 +21,11 @@ class User &lt; ActiveRecord::Base
     end
   end
-  before_create :make_activation_code
-
   before_create do |user|
     if user.environment.nil?
       user.environment = Environment.default
     end
+    user.send(:make_activation_code) unless user.environment.enabled?('skip_new_user_email_confirmation')
   end
   after_create do |user|
@@ -35,7 +34,7 @@ class User &lt; ActiveRecord::Base
     user.person.name ||= user.login
     user.person.visible = false unless user.activated?
     user.person.save!
-    if user.environment && user.environment.enabled?('skip_new_user_email_confirmation')
+    if user.environment.enabled?('skip_new_user_email_confirmation')
       user.activate
     end
   end
@@ -118,7 +117,7 @@ class User &lt; ActiveRecord::Base
     self.activated_at = Time.now.utc
     self.activation_code = nil
     self.person.visible = true
-    self.person.save! && self.save
+    self.person.save! && self.save!
   end
   def activated?
@@ -0,0 +1,9 @@
+<% if profile.lat %>
+  <%= block_title block.title %>
+  <div class='the-localization-map'>
+    <img src="http://maps.google.com/maps/api/staticmap?center=<%=profile.lat%>,<%=profile.lng%>&zoom=<%=block.zoom%>&size=190x250&maptype=<%=block.map_type%>&markers=<%=profile.lat%>,<%=profile.lng%>&sensor=false"/>
+  </div>
+</div>
+<% else %>
+  <i><%= _('This profile has no geographical position registered.') %></i>
+<% end %>
@@ -56,7 +56,7 @@
             <div>
               <div class="arrow"></div>
               <div class="content" id="product-price-composition">
-                <% product.inputs.each do |i| %>
+                <% product.inputs.relevant_to_price.each do |i| %>
                   <div class="search-product-input-dots-to-price">
                     <div class="search-product-input-name"><%= i.product_category.name %></div>
                     <%= price_span i.cost, :class => 'search-product-input-price' %>
@@ -5,27 +5,113 @@ var marker;
 var center;
 var move = true;
 var previousCenter;
+var mapZoom = 15;
+var delay_autocomplete = 500;
-function getAddress(latlng) {
+function pointToAddress(latlng) {
   $('location-fields').addClassName("loading");
-   if (latlng != null) {
-    geocoder.geocode( {'latLng': latlng}, showAddress);
-   }
+  if (latlng == null)
+    return;
+
+  geocoder.geocode( {'latLng': latlng}, function(results, status) {
+    if (status != google.maps.GeocoderStatus.OK) {
+      alert("<%=_("Address not found, reason:")%>" + statusErrorMessage(status));
+      return;
+    }
+
+    var place = results[0];
+
+    $('location-fields').removeClassName("loading");
+
+    var position = marker.getPosition();
+    $('profile_data_lat').value = position.lat();
+    $('profile_data_lng').value = position.lng();
+
+    form = jQuery('#location-form')[0];
+    form.lat = marker.getPosition().lat();
+    form.lng = marker.getPosition().lng();
+
+    var components_len = place.address_components.size();
+    if (components_len < 2)
+      return;
+
+    var country_code = "";
+    var state = "";
+    var city = "";
+    var zip_code = "";
+    var route = "";
+    var number = "";
+    var sublocality = "";
+    var address = "";
+
+    var i;
+    var has_postal_code = false;
+    for (i=0; i < components_len; i++) {
+      type = place.address_components[i].types[0];
+      if (type == 'postal_code')
+        has_postal_code = true;
+    }
+
+    for (i=0; i < components_len; i++) {
+      type = place.address_components[i].types[0];
+      value = place.address_components[i];
+
+      if (type == 'country')
+        country_code = value.short_name;
+      else if (type == 'administrative_area_level_1')
+        state = value.long_name;
+      else if (type == 'locality')
+        city = value.long_name;
+      else if (type == 'postal_code')
+        zip_code = value.short_name;
+      if (has_postal_code) {
+        if (type == "route")
+          route = value.long_name;
+        else if (type == "street_number")
+          number = value.short_name;
+        else if (type == 'sublocality')
+          sublocality = value.long_name;
+      }
+    }
+
+    // build address
+    if (route) {
+      address = route;
+      if (number)
+       address = address + ', ' + number;
+      if (sublocality && sublocality != city)
+       address = address + ', ' + sublocality;
+    }
+
+    if (country_code)
+      $('profile_data_country').value = country_code;
+    if (state)
+      $('profile_data_state').value = state;
+    if (city)
+      $('profile_data_city').value = city;
+    if (zip_code)
+      $('profile_data_zip_code').value = zip_code;
+    if (address)
+      $('profile_data_address').value = address;
+
+    map.setCenter(marker.getPosition());
+  });
 }
-function codeAddress() {
+function addressToPoint() {
   $('location-fields').addClassName("loading");
   var country_option = $('profile_data_country').value;
-  var address = $('profile_data_address').value + "-" + $('profile_data_zip_code').value + "," + $('profile_data_city').value+ "-" + $('profile_data_state').value + "," + country_option;
+  var address = $('profile_data_address').value + ", " + $('profile_data_zip_code').value + ", "
+    + $('profile_data_city').value+ ", " + $('profile_data_state').value + ", " + country_option;
   if (geocoder) {
-   geocoder.geocode( { 'address': address}, function(results, status) {
+   geocoder.geocode({ 'address': address}, function(results, status) {
      if (status == google.maps.GeocoderStatus.OK) {
        map.setCenter(results[0].geometry.location);
        marker.setPosition(results[0].geometry.location);
-       getAddress(marker.getPosition());
+       pointToAddress(marker.getPosition());
        $('profile_data_lat').value = results[0].geometry.location.lat();
        $('profile_data_lng').value = results[0].geometry.location.lng();
@@ -33,17 +119,15 @@ function codeAddress() {
        enable_save();
      } else {
        $('location-fields').removeClassName("loading");
-       alert('<%=_("Address not found, reason:")%>' + translate_status(status));
+       alert('<%=_("Address not found, reason:")%>' + statusErrorMessage(status));
      }
    });
   }
-  map.setZoom(11);
-
   return false;
 }
-function translate_status(status)
+function statusErrorMessage(status)
 {
   var translated_status = '';
@@ -59,136 +143,42 @@ function translate_status(status)
   return translated_status;
 }
-function getAddressData() {
-  var text = '';
-  var fields = [
-    'profile_data_country',
-    'profile_data_state',
-    'profile_data_city',
-    'profile_data_address',
-    'profile_data_zip_code'
-  ];
-  for (var i = 0; i < fields.length; i++) {
-    var field = fields[i];
-    if ($(field)) {
-      text += $(field).value + " ";
-    }
-  }
-  return text;
-}
-
-function showAddress(results, status) {
-
-  if (status == google.maps.GeocoderStatus.OK) {
-    map.setCenter(results[0].geometry.location);
-    updateFields(results[0]);
-
-  } else {
-    alert("<%=_("Address not found, reason:")%>" + translate_status(status));
-  }
-
-}
-
-function updateFields(place) {
-  var position = marker.getPosition();
-  $('profile_data_lat').value = position.lat();
-  $('profile_data_lng').value = position.lng();
-  $('location-fields').removeClassName("loading");
-
-  form = jQuery('#location-form')[0];
-  form.lat = marker.getPosition().lat();
-  form.lng = marker.getPosition().lng();
-
-  var components_len = place.address_components.size();
-
-  if(components_len <  2)
-  {
-    return false;
-  }
-
-  var components = place.address_components;
-  var address = "";
-  var zip_code = "";
-  var city = "";
-  var state = "";
-  var country_code = "";
-  var i = 0;
-
-  for( i =0 ; i < components_len; i ++)
-  {
-
-      if (components[i].types[0] == 'country')
-        country_code = components[i].short_name;
-      else if (components[i].types[0] == 'administrative_area_level_1')
-        state = components[i].long_name;
-      else if (components[i].types[0] == 'locality')
-        city  = components[i].long_name;
-      else if (components[i].types[0] == 'sublocality')
-        address  = components[i].long_name  + "-" + address;
-      else if (components[i].types[0] == "route")
-        address = components[i].long_name + address;
-      else if (components[i].types[0] == "street_number")
-        address =  address + "," + components[i].short_name ;
-      else if (components[i].types[0] == 'postal_code')
-        zip_code = components[i].short_name;
-  }
-
-  $('profile_data_country').value = country_code;
-  $('profile_data_state').value = state;
-  $('profile_data_address').value = address;
-  $('profile_data_city').value = city;
-  $('profile_data_zip_code').value = zip_code;
-}
-
-
-function initialize_map() {
+function initializeMap() {
   geocoder = new google.maps.Geocoder();
   var lat = <%= profile.lat || 'false' %>;
   var lng = <%= profile.lng || 'false' %>;
-
   if ( !(lat && lng) ) {
     lat = -15.7605361485013;
     lng = -47.933349609375;
   }
-  var latlng = new google.maps.LatLng(lat,lng);
-
-  var myOptions = {
-    zoom: 8,
-    center: latlng,
-    mapTypeId: google.maps.MapTypeId.ROADMAP
-  }
-
-  center = latlng;
-
-  map = new google.maps.Map(document.getElementById("location-map"), myOptions);
-
-  continueLoadMapV3()
-}
-
-function continueLoadMapV3() {
+  var center = new google.maps.LatLng(lat,lng);;
+  map = new google.maps.Map(document.getElementById("location-map"), {
+    zoom: mapZoom,
+    center: center,
+    mapTypeId: google.maps.MapTypeId.HYBRID
+  });
-   marker = new google.maps.Marker({
-            position: center,
-            map: map,
-            draggable: true
-    });
+  marker = new google.maps.Marker({
+    position: center,
+    map: map,
+    draggable: true
+  });
-    google.maps.event.addListener(marker, "dragend", function() {
-      move = false;
-      getAddress(marker.getPosition());
-      enable_save();
-    });
+  google.maps.event.addListener(marker, "dragend", function() {
+    move = false;
+    pointToAddress(marker.getPosition());
+    map.setCenter(marker.getPosition());
+    enable_save();
+  });
 }
-window.onload = initialize_map;
-
-var delay_autocomplete = 500;
-
 jQuery.noConflict();
-jQuery(document).ready(function (){
+jQuery(document).ready(function () {
+
+  initializeMap();
   jQuery.widget( "custom.catcomplete",jQuery.ui.autocomplete, {
     _renderMenu: function( ul, items ) {
@@ -204,7 +194,6 @@ jQuery(document).ready(function (){
     }
   });
-
   jQuery("#profile_data_city").catcomplete({
     source: "../maps/search_city",
     minLength: 3,
@@ -219,21 +208,13 @@ jQuery(document).ready(function (){
   });
   jQuery("#profile_data_city").keyup(function(){
-
     disable_save();
-
   });
-
   jQuery("#profile_data_state").keyup(function(){
-
     disable_save();
-
   });
-
   jQuery("#profile_data_country").change(function(){
-
     disable_save();
-
   });
 });
@@ -12,7 +12,7 @@
     <%= labelled_form_field _('ZIP code'), text_field(:profile_data, :zip_code) %>
     <%= labelled_form_field _('Address (street and number)'), text_field(:profile_data, :address) %>
     <% button_bar do %>
-      <%= button_to_function :search, _('Locate in the map'), "codeAddress()", :title => _("Locate the address informed above in the map below (note that you'll probably need to adjust the marker to get a precise position)")  %>
+      <%= button_to_function :search, _('Locate in the map'), "addressToPoint()", :title => _("Locate the address informed above in the map below (note that you'll probably need to adjust the marker to get a precise position)")  %>
       <%= submit_button 'save', _('Save') %>
       <%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
     <% end %>
@@ -3,15 +3,17 @@
     <p class='profile-wall-reply'>
       <% update_area = tab_action == 'wall' ? 'profile_activities' : 'network-activities' %>
       <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_comment_on_activity', :tab_action => tab_action}, :html => { :class => 'profile-wall-reply-form', 'data-update' => update_area } do %>
-        <%= text_area :comment, :body, {:id => "reply_content_#{activity.id}",
-                                        :cols => 50,
-                                        :rows => 1,
-                                        :class => 'submit-with-keypress',
-                                        :title => _('Leave your comment'),
-                                        :onfocus => ('if(this.value==this.title){this.value="";this.style.color="#000"};this.style.backgroundImage="url(' + profile_icon(current_person, :icon, false) + ')"' if logged_in?),
-                                        :onblur => ('if(this.value==""){this.value=this.title;this.style.color="#ccc"};this.style.backgroundImage="none"' if logged_in?),
-                                        :value => _('Leave your comment'),
-                                        :style => 'color: #ccc' } %>
+        <%= expandable_text_area :comment,
+                                 :body,
+                                 "reply_content_#{activity.id}",
+                                 :cols => 50,
+                                 :rows => 1,
+                                 :class => 'submit-with-keypress',
+                                 :title => _('Leave your comment'),
+                                 :onfocus => ('if(this.value==this.title){this.value="";this.style.color="#000"};this.style.backgroundImage="url(' + profile_icon(current_person, :icon, false) + ')"' if logged_in?),
+                                 :onblur => ('if(this.value==""){this.value=this.title;this.style.color="#ccc"};this.style.backgroundImage="none"' if logged_in?),
+                                 :value => _('Leave your comment'),
+                                 :style => 'color: #ccc' %>
         <%= hidden_field_tag :source_id, activity.id, :id => "activity_id_#{activity.id}" %>
       <% end %>
     </p>
@@ -2,15 +2,16 @@
   <div id='profile-wall-reply-form-<%= scrap.id%>' style='display:none'>
     <p class='profile-wall-reply'>
       <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap'}, :update => "profile_activities", :html => { :class => 'profile-wall-reply-form'} do %>
-        <%= text_area :scrap, :content, { :id => "reply_content_#{scrap.id}",
-                                          :cols => 50,
-                                          :rows => 1,
-                                          :class => 'submit-with-keypress',
-                                          :title => _('Leave your comment'),
-                                          :onfocus => ('if(this.value==this.title){this.value="";this.style.color="#000"};this.style.backgroundImage="url(' + profile_icon(current_person, :icon, false) + ')"' if logged_in?),
-                                          :onblur => ('if(this.value==""){this.value=this.title;this.style.color="#ccc"};this.style.backgroundImage="none"' if logged_in?),
-                                        :value => _('Leave your comment')
-                                        } %>
+        <%= expandable_text_area :scrap,
+                                 :content,
+                                 "reply_content_#{scrap.id}",
+                                 :cols => 50,
+                                 :rows => 1,
+                                 :class => 'submit-with-keypress',
+                                 :title => _('Leave your comment'),
+                                 :onfocus => ('if(this.value==this.title){this.value="";this.style.color="#000"};this.style.backgroundImage="url(' + profile_icon(current_person, :icon, false) + ')"' if logged_in?),
+                                 :onblur => ('if(this.value==""){this.value=this.title;this.style.color="#ccc"};this.style.backgroundImage="none"' if logged_in?),
+                                 :value => _('Leave your comment') %>
         <%= hidden_field_tag 'scrap[scrap_id]', scrap.id %>
         <%= hidden_field_tag 'receiver_id', scrap.sender.id %>
       <% end %>
@@ -29,7 +29,6 @@
           <% if logged_in? && current_person.follows?(@profile) %>
             <% tabs << {:title => _('Wall'), :id => 'profile-wall', :content => (render :partial => 'profile_wall')} %>
           <% end %>
-          <% tabs << {:title => _('What\'s new'), :id => 'profile-network', :content => (render :partial => 'profile_network')} %>
         <% elsif @profile.person? %>
           <% tabs << {:title => _('Profile'), :id => 'person-profile', :content => (render :partial => 'person_profile')} %>
           <% if logged_in? && current_person.follows?(@profile) %>
@@ -27,9 +27,9 @@
           <% end %>
           <% if product.price_described? %>
-            <% title = (product.inputs + product.price_details).map{ |i|
+            <% title = (product.inputs.relevant_to_price + product.price_details).map{ |i|
               '<div class="search-product-input-dots-to-price">' +
-                '<div class="search-product-input-name">' + i.product_category.name + '</div>' +
+                '<div class="search-product-input-name">' + i.name + '</div>' +
                 price_span(i.price, :class => 'search-product-input-price') +
               '</div>' }.join('') %>
             <%= link_to_function _("Open Price"), '', :title => title, :class => "search-product-price-details" %>
@@ -0,0 +1,9 @@
+class SetActivationCodeToNilIfAlreadyActivated < ActiveRecord::Migration
+  def self.up
+    update("UPDATE users SET activation_code = null WHERE activated_at IS NOT NULL")
+  end
+
+  def self.down
+    say('Can not be reverted.')
+  end
+end
@@ -0,0 +1,14 @@
+class RemoveActionTrackerWithTargetNil < ActiveRecord::Migration
+  def self.up
+    select_all("SELECT id FROM action_tracker").each do |tracker|
+      activity = ActionTracker::Record.find_by_id(tracker['id'])
+      if activity && activity.target.nil?
+        activity.destroy
+      end
+    end
+  end
+
+  def self.down
+    say "this migration can't be reverted"
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20120718162001) do
+ActiveRecord::Schema.define(:version => 20120818030329) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
+noosfero (0.38.1) unstable; urgency=low
+
+  * Bugfixes release
+
+ -- Daniela Soares Feitosa <daniela@colivre.coop.br>  Sat, 18 Aug 2012 07:49:59 -0300
+
 noosfero (0.38.0) unstable; urgency=low
   * Features version release
-/var/log/noosfero/*.log /home/noosfero/current/log/*.log {
+/var/log/noosfero/*.log {
         daily
         missingok
         rotate 30
@@ -30,16 +30,6 @@ Feature: private profiles
     When I go to shygirl's homepage
     Then I should not see "Add friend"
-  Scenario: viewing a private community profile shouldn't show the news if not logged or not a member
-    Given I am on Safernet's homepage
-    Then I should not see "What's new"
-    And I am logged in as "joao"
-    When I am on Safernet's homepage
-    Then I should not see "What's new"
-    And "joao" is a member of "Safernet"
-    When I am on Safernet's homepage
-    Then I should see "What's new"
-
   Scenario: person private profiles should not display sensible information
     Given I am logged in as "joao"
     When I go to shygirl's homepage
@@ -2,7 +2,7 @@ require &#39;fast_gettext&#39;
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.38.0'
+  VERSION = '0.38.1'
   def self.pattern_for_controllers_in_directory(dir)
     disjunction = controllers_in_directory(dir).join('|')
@@ -11,13 +11,13 @@ jQuery(&quot;#usp_id_field&quot;).observe_field(1, function(){
               jQuery('#signup-birth-date').hide();
               jQuery('#signup-cpf').show();
               jQuery('#confirmation_field').remove();
-              jQuery('#signup-form').append('<input id="confirmation_field" type="hidden" value="cpf" name="confirmation_field">')
+              jQuery('<input id="confirmation_field" type="hidden" value="cpf" name="confirmation_field">').insertAfter('#usp_id_field');
             }
             else {
               jQuery('#signup-cpf').hide();
               jQuery('#signup-birth-date').show();
               jQuery('#confirmation_field').remove();
-              jQuery('#signup-form').append('<input id="confirmation_field" type="hidden" value="birth_date" name="confirmation_field">')
+              jQuery('<input id="confirmation_field" type="hidden" value="birth_date" name="confirmation_field">').insertAfter('#usp_id_field');
             }
             jQuery('#signup-form .submit').attr('disabled', false);
             jQuery(me).removeClass('checking').addClass('validated');
@@ -622,7 +622,7 @@ function hide_and_show(hide_elements, show_elements) {
 function limited_text_area(textid, limit) {
   var text = jQuery('#' + textid).val();
-  jQuery('#' + textid).css('height', jQuery('#' + textid).attr('scrollHeight') + 'px');
+  grow_text_area(textid);
   var textlength = text.length;
   jQuery('#' + textid + '_left span').html(limit - textlength);
   if (textlength > limit) {
@@ -637,6 +637,15 @@ function limited_text_area(textid, limit) {
   }
 }
+function grow_text_area(textid) {
+  var height = jQuery('#' + textid).attr('scrollHeight');
+  if (jQuery.browser.webkit) {
+    height -= parseInt(jQuery('#' + textid).css('padding-top')) +
+              parseInt(jQuery('#' + textid).css('padding-bottom'));
+  }
+  jQuery('#' + textid).css('height', height + 'px');
+}
+
 jQuery(function($) {
   $('a').each(function() {
     if (this.href == document.location.href) {
@@ -5073,7 +5073,7 @@ h1#agenda-title {
 #profile-network li textarea:focus,
 #profile-wall li textarea:focus {
-  background-position: left center;
+  background-position: left top;
   background-repeat: no-repeat;
   text-indent: 28px;
 }
@@ -5150,8 +5150,8 @@ h1#agenda-title {
 #profile-wall .profile-wall-activities-comments img,
 #profile-network .profile-wall-activities-comments img {
-  max-width: 50px;
-  max-height: 50px;
+  max-width: 32px;
+  max-height: 32px;
 }
 #profile-wall .profile-wall-activities-comments .comment_reply,
@@ -5163,7 +5163,8 @@ h1#agenda-title {
 #profile-wall .profile-wall-activities-comments .comment-picture,
 #profile-network .profile-wall-activities-comments .comment-picture {
-  width: 50px;
+  width: 32px;
+  margin-right: 5px;
   text-align: center;
 }
@@ -610,6 +610,15 @@ class AccountControllerTest &lt; ActionController::TestCase
     assert_equal 'example.com', Person['testuser'].organization
   end
+  should 'activate user after signup if environment is set to skip confirmation' do
+    env = Environment.default
+    env.enable('skip_new_user_email_confirmation')
+    env.save!
+    new_user(:login => 'activated_user')
+    user = User.find_by_login('activated_user')
+    assert user.activated?
+  end
+
   should 'redirect to initial page after logout' do
     login_as :johndoe
     get :logout
@@ -79,7 +79,7 @@ class ActiveSupport::TestCase
     destname = 'test_should_' + name.gsub(/[^a-zA-z0-9]+/, '_')
     if @shoulds.include?(destname)
-      raise "there is already a test named \"#{destname}\"" 
+      raise "there is already a test named \"#{destname}\""
     end
     @shoulds << destname
@@ -121,7 +121,7 @@ class ActiveSupport::TestCase
     object.valid?
     assert !object.errors.invalid?(attribute)
   end
-  
+
   def assert_subclass(parent, child)
     assert_equal parent, child.superclass, "Class #{child} expected to be a subclass of #{parent}"
   end
@@ -150,7 +150,7 @@ class ActiveSupport::TestCase
       get action, params
     end
     doc = Hpricot @response.body
-    
+
     # Test style references:
     (doc/'style').each do |s|
       s = s.to_s().gsub( /\/\*.*\*\//, '' ).
@@ -193,6 +193,12 @@ class ActiveSupport::TestCase
     assert !tag, "expected no tag #{options.inspect}, but tag found in #{text.inspect}"
   end
+  # For models that render views (blocks, articles, ...)
+  def render(*args)
+    view_paths = @explicit_view_paths || ActionController::Base.view_paths
+    ActionView::Base.new(view_paths, {}).render(*args)
+  end
+
   private
   def uses_host(name)
@@ -977,9 +977,9 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_equivalent [p1,p2,community], ActionTrackerNotification.find_all_by_action_tracker_id(activity.id).map(&:profile)
   end
-  should 'not track action when a published article is removed' do
+  should 'destroy activity when a published article is removed' do
     a = create(TinyMceArticle, :profile_id => profile.id)
-    assert_no_difference ActionTracker::Record, :count do
+    assert_difference ActionTracker::Record, :count, -1 do
       a.destroy
     end
   end
@@ -1115,6 +1115,51 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_equal 3, ActionTrackerNotification.find_all_by_action_tracker_id(article2.activity.id).count
   end
+  should 'destroy activity and notifications of friends when destroying an article' do
+    friend = fast_create(Person)
+    profile.add_friend(friend)
+    Article.destroy_all
+    ActionTracker::Record.destroy_all
+    ActionTrackerNotification.destroy_all
+    UserStampSweeper.any_instance.expects(:current_user).returns(profile).at_least_once
+    article = create(TinyMceArticle, :profile_id => profile.id)
+    activity = article.activity
+
+    process_delayed_job_queue
+    assert_equal 2, ActionTrackerNotification.find_all_by_action_tracker_id(activity.id).count
+
+    assert_difference ActionTrackerNotification, :count, -2 do
+      article.destroy
+    end
+
+    assert_raise ActiveRecord::RecordNotFound do
+      ActionTracker::Record.find(activity.id)
+    end
+  end
+
+  should 'destroy action_tracker and notifications when an article is destroyed in a community' do
+    community = fast_create(Community)
+    p1 = fast_create(Person)
+    p2 = fast_create(Person)
+    community.add_member(p1)
+    community.add_member(p2)
+    UserStampSweeper.any_instance.expects(:current_user).returns(p1).at_least_once
+
+    article = create(TinyMceArticle, :profile_id => community.id)
+    activity = article.activity
+
+    process_delayed_job_queue
+    assert_equal 3, ActionTrackerNotification.find_all_by_action_tracker_id(activity.id).count
+
+    assert_difference ActionTrackerNotification, :count, -3 do
+      article.destroy
+    end
+
+    assert_raise ActiveRecord::RecordNotFound do
+      ActionTracker::Record.find(activity.id)
+    end
+  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')
@@ -177,4 +177,18 @@ class InputTest &lt; ActiveSupport::TestCase
     assert_equal 0.00, input.cost
   end
+  should 'list inputs relevants to price' do
+    product_category = fast_create(ProductCategory)
+    product = fast_create(Product, :product_category_id => product_category.id)
+
+    i1 = Input.create!(:product => product, :product_category => product_category, :relevant_to_price => true)
+
+    i2 = Input.create!(:product => product, :product_category => product_category, :relevant_to_price => false)
+
+    i1.save!
+    i2.save!
+    assert_includes Input.relevant_to_price, i1
+    assert_not_includes Input.relevant_to_price, i2
+  end
+
 end
@@ -2,6 +2,9 @@ require File.dirname(__FILE__) + &#39;/../test_helper&#39;
 class LocationBlockTest < ActiveSupport::TestCase
+  ActionView::Base.send :include, BlockHelper
+  include BoxesHelper
+
   def setup
     @profile = create_user('lele').person
     @block = LocationBlock.new
@@ -15,7 +18,7 @@ class LocationBlockTest &lt; ActiveSupport::TestCase
   end
   should 'display no localization map without lat' do
-    assert_tag_in_string block.content, :tag => 'i'
+    assert_tag_in_string extract_block_content(block.content), :tag => 'i'
   end
   should 'be editable' do
@@ -28,8 +31,10 @@ class LocationBlockTest &lt; ActiveSupport::TestCase
   should 'use google maps api v3' do
     @block.owner.lat = '-12.34'; @block.owner.save!
-    assert_match 'http://maps.google.com/maps/api/staticmap', @block.content
-    assert_no_match /key=/, @block.content
+    content = extract_block_content(@block.content)
+
+    assert_match 'http://maps.google.com/maps/api/staticmap', content
+    assert_no_match /key=/, content
   end
 end
@@ -93,10 +93,21 @@ class MailingTest &lt; ActiveSupport::TestCase
     assert_equal '', mailing.url
   end
-  should 'deliver mailing to each recipient after create' do
-    person = Person['user_one']
-    mailing = Mailing.create(:source => environment, :subject => 'Hello', :body => 'We have some news', :person => person)
-    process_delayed_job_queue
-    assert_equal [], ActionMailer::Base.deliveries
+  should 'process the entire batch even if individual emails crash' do
+    mailing = Mailing.new(:source => environment, :person => Person['user_one'], :body => 'test', :subject => 'test')
+    def mailing.each_recipient
+      user_one = Person['user_one']
+      user_two = Person['user_two']
+      user_one.stubs(:email).raises(RuntimeError.new)
+      [user_one, user_two].each do |p|
+        yield p
+      end
+    end
+    mailing.stubs(:schedule)
+    mailing.save!
+    mailing.deliver
+
+    assert_equal 1, ActionMailer::Base.deliveries.size
   end
+
 end
@@ -54,7 +54,7 @@ class PriceDetailTest &lt; ActiveSupport::TestCase
     p = PriceDetail.new
     p.valid?
-    assert p.errors.invalid?(:production_cost_id)
+    assert p.errors.invalid?(:production_cost)
   end
   should 'th production cost be unique on scope of product' do
@@ -78,4 +78,14 @@ class PriceDetailTest &lt; ActiveSupport::TestCase
     assert_equal "10.00", price_detail.formatted_value(:price)
   end
+  should 'have the production cost name as name' do
+    product = fast_create(Product)
+    cost = fast_create(ProductionCost, :name => 'Energy',:owner_id => Environment.default.id, :owner_type => 'environment')
+
+    detail = product.price_details.create(:production_cost => cost, :price => 10)
+
+    assert_equal 'Energy', detail.name
+  end
+
+
 end
@@ -381,6 +381,15 @@ class ProductTest &lt; ActiveSupport::TestCase
     assert_equal 50.0, product.inputs_cost
   end
+  should 'return total value only of inputs relevant to price' do
+    product = fast_create(Product)
+    first_relevant = fast_create(Input, :product_id => product.id, :product_category_id => fast_create(ProductCategory).id, :price_per_unit => 20.0, :amount_used => 2)
+    second_relevant = fast_create(Input, :product_id => product.id, :product_category_id => fast_create(ProductCategory).id, :price_per_unit => 10.0, :amount_used => 1)
+    not_relevant = fast_create(Input, :product_id => product.id, :product_category_id => fast_create(ProductCategory).id, :price_per_unit => 10.0, :amount_used => 1, :relevant_to_price => false)
+
+    assert_equal 50.0, product.inputs_cost
+  end
+
   should 'return 0 on total value of inputs if has no input' do
     product = fast_create(Product)
@@ -750,6 +759,8 @@ class ProductTest &lt; ActiveSupport::TestCase
   end
   should 'return more recent products' do
+    Product.destroy_all
+
     prod1 = Product.create!(:name => 'Damaged LP', :enterprise_id => @profile.id, :product_category_id => @product_category.id)
     prod2 = Product.create!(:name => 'Damaged CD', :enterprise_id => @profile.id, :product_category_id => @product_category.id)
     prod3 = Product.create!(:name => 'Damaged DVD', :enterprise_id => @profile.id, :product_category_id => @product_category.id)
@@ -1862,7 +1862,6 @@ class ProfileTest &lt; ActiveSupport::TestCase
     # fields
     assert_includes Profile.find_by_contents('Hiro')[:results].docs, p
-    assert_includes Profile.find_by_contents('Stor')[:results].docs, p
     assert_includes Profile.find_by_contents('Protagonist')[:results].docs, p
     # filters
     assert_includes Profile.find_by_contents('Hiro', {}, { :filter_queries => ["public:true"]})[:results].docs, p
@@ -1872,13 +1871,15 @@ class ProfileTest &lt; ActiveSupport::TestCase
     assert_includes Profile.find_by_contents("Inglewood")[:results].docs, p
     assert_includes Profile.find_by_contents("California")[:results].docs, p
     assert_includes Profile.find_by_contents("Science")[:results].docs, p
+    # not includes
+    assert_not_includes Profile.find_by_contents('Stor')[:results].docs, p
   end
   should 'boost name matches' do
     TestSolr.enable
     in_addr = create(Person, :name => 'something', :address => 'bananas in the address!', :user_id => fast_create(User).id)
     in_name = create(Person, :name => 'bananas in the name!', :user_id => fast_create(User).id)
-    assert_equal [in_name, in_addr], Person.find_by_contents('bananas')[:results].docs
+    assert_equal [in_name], Person.find_by_contents('bananas')[:results].docs
   end
   should 'reindex articles after saving' do
@@ -70,20 +70,20 @@ class TextileArticleTest &lt; ActiveSupport::TestCase
     end
   end
-  should 'not notify activity on destroy' do
+  should 'remove activity after destroying article' do
     ActionTracker::Record.delete_all
     a = TextileArticle.create! :name => 'bar', :profile_id => fast_create(Profile).id, :published => true
-    assert_no_difference ActionTracker::Record, :count do
+    assert_difference ActionTracker::Record, :count, -1 do
       a.destroy
     end
   end
-  should 'not notify when an article is destroyed' do
+  should 'remove activity after article is destroyed' do
     ActionTracker::Record.delete_all
     a1 = TextileArticle.create! :name => 'bar', :profile_id => fast_create(Profile).id, :published => true
     a2 = TextileArticle.create! :name => 'another bar', :profile_id => fast_create(Profile).id, :published => true
     assert_equal 2, ActionTracker::Record.count
-    assert_no_difference ActionTracker::Record, :count do
+    assert_difference ActionTracker::Record, :count, -2 do
       a1.destroy
       a2.destroy
     end
@@ -168,11 +168,11 @@ class TinyMceArticleTest &lt; ActiveSupport::TestCase
     end
   end
-  should 'not notify when an article is destroyed' do
+  should 'remove activity when an article is destroyed' do
     ActionTracker::Record.delete_all
     a1 = TinyMceArticle.create! :name => 'bar', :profile_id => fast_create(Profile).id, :published => true
     a2 = TinyMceArticle.create! :name => 'another bar', :profile_id => fast_create(Profile).id, :published => true
-    assert_no_difference ActionTracker::Record, :count do
+    assert_difference ActionTracker::Record, :count, -2 do
       a1.destroy
       a2.destroy
 end
	@@ -243,7 +243,7 @@ class SearchController < PublicController		@@ -243,7 +243,7 @@ class SearchController < PublicController
243	@searching = {}	243	@searching = {}
244	@titles = {}	244	@titles = {}
245	@enabled_searches.each do \|key, name\|	245	@enabled_searches.each do \|key, name\|
246	- @titles[key] = name	246	+ @titles[key] = _(name)
247	@searching[key] = params[:action] == 'index' \|\| params[:action] == key.to_s	247	@searching[key] = params[:action] == 'index' \|\| params[:action] == key.to_s
248	end	248	end
249	@names = @titles if @names.nil?	249	@names = @titles if @names.nil?
	@@ -9,6 +9,8 @@ class Input < ActiveRecord::Base		@@ -9,6 +9,8 @@ class Input < ActiveRecord::Base
9		9
10	belongs_to :unit	10	belongs_to :unit
11		11
		12	+ named_scope :relevant_to_price, :conditions => { :relevant_to_price => true }
		13	+
12	include FloatHelper	14	include FloatHelper
13		15
14	def price_per_unit=(value)	16	def price_per_unit=(value)
	@@ -5,4 +5,5 @@ class ProductionCost < ActiveRecord::Base		@@ -5,4 +5,5 @@ class ProductionCost < ActiveRecord::Base
5	validates_presence_of :name	5	validates_presence_of :name
6	validates_length_of :name, :maximum => 30, :allow_blank => true	6	validates_length_of :name, :maximum => 30, :allow_blank => true
7	validates_uniqueness_of :name, :scope => [:owner_id, :owner_type]	7	validates_uniqueness_of :name, :scope => [:owner_id, :owner_type]
		8	+
8	end	9	end
	@@ -208,7 +208,7 @@ class Profile < ActiveRecord::Base		@@ -208,7 +208,7 @@ class Profile < ActiveRecord::Base
208	end	208	end
209		209
210	belongs_to :region	210	belongs_to :region
211	-	211	+
212	def location(separator = ' - ')	212	def location(separator = ' - ')
213	myregion = self.region	213	myregion = self.region
214	if myregion	214	if myregion
	@@ -295,12 +295,12 @@ class Profile < ActiveRecord::Base		@@ -295,12 +295,12 @@ class Profile < ActiveRecord::Base
295	true	295	true
296	end	296	end
297		297
298	- # registar callback for creating boxes after the object is created.	298	+ # registar callback for creating boxes after the object is created.
299	after_create :create_default_set_of_boxes	299	after_create :create_default_set_of_boxes
300		300
301	# creates the initial set of boxes when the profile is created. Can be	301	# creates the initial set of boxes when the profile is created. Can be
302	# overriden for each subclass to create a custom set of boxes for its	302	# overriden for each subclass to create a custom set of boxes for its
303	- # instances.	303	+ # instances.
304	def create_default_set_of_boxes	304	def create_default_set_of_boxes
305	if template	305	if template
306	apply_template(template, :copy_articles => false)	306	apply_template(template, :copy_articles => false)
	@@ -420,7 +420,7 @@ class Profile < ActiveRecord::Base		@@ -420,7 +420,7 @@ class Profile < ActiveRecord::Base
420		420
421	# returns +false+	421	# returns +false+
422	def person?	422	def person?
423	- self.kind_of?(Person)	423	+ self.kind_of?(Person)
424	end	424	end
425		425
426	def enterprise?	426	def enterprise?
	@@ -528,7 +528,7 @@ private :generate_url, :url_options		@@ -528,7 +528,7 @@ private :generate_url, :url_options
528		528
529	after_create :insert_default_article_set	529	after_create :insert_default_article_set
530	def insert_default_article_set	530	def insert_default_article_set
531	- if template	531	+ if template
532	copy_articles_from template	532	copy_articles_from template
533	else	533	else
534	default_set_of_articles.each do \|article\|	534	default_set_of_articles.each do \|article\|
	@@ -598,7 +598,7 @@ private :generate_url, :url_options		@@ -598,7 +598,7 @@ private :generate_url, :url_options
598	raise _("%s can't have members") % self.class.name	598	raise _("%s can't have members") % self.class.name
599	end	599	end
600	end	600	end
601	-	601	+
602	def remove_member(person)	602	def remove_member(person)
603	self.disaffiliate(person, Profile::Roles.all_roles(environment.id))	603	self.disaffiliate(person, Profile::Roles.all_roles(environment.id))
604	end	604	end
	@@ -895,7 +895,7 @@ private :generate_url, :url_options		@@ -895,7 +895,7 @@ private :generate_url, :url_options
895		895
896	def self.f_enabled_proc(enabled)	896	def self.f_enabled_proc(enabled)
897	enabled = enabled == "true" ? true : false	897	enabled = enabled == "true" ? true : false
898	- enabled ? _('Enabled') : _('Not enabled')	898	+ enabled ? s_('facets\|Enabled') : s_('facets\|Not enabled')
899	end	899	end
900	def f_enabled	900	def f_enabled
901	self.enabled	901	self.enabled
	@@ -924,7 +924,7 @@ private :generate_url, :url_options		@@ -924,7 +924,7 @@ private :generate_url, :url_options
924	acts_as_searchable :fields => facets_fields_for_solr + [:extra_data_for_index,	924	acts_as_searchable :fields => facets_fields_for_solr + [:extra_data_for_index,
925	# searched fields	925	# searched fields
926	{:name => {:type => :text, :boost => 2.0}},	926	{:name => {:type => :text, :boost => 2.0}},
927	- {:identifier => :text}, {:address => :text}, {:nickname => :text},	927	+ {:identifier => :text}, {:nickname => :text},
928	# filtered fields	928	# filtered fields
929	{:public => :boolean}, {:environment_id => :integer},	929	{:public => :boolean}, {:environment_id => :integer},
930	{:category_filter => :integer},	930	{:category_filter => :integer},
	@@ -944,7 +944,7 @@ private :generate_url, :url_options		@@ -944,7 +944,7 @@ private :generate_url, :url_options
944		944
945	def control_panel_settings_button	945	def control_panel_settings_button
946	{:title => _('Profile Info and settings'), :icon => 'edit-profile'}	946	{:title => _('Profile Info and settings'), :icon => 'edit-profile'}
947	- end	947	+ end
948		948
949	def followed_by?(person)	949	def followed_by?(person)
950	person.is_member_of?(self)	950	person.is_member_of?(self)
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+<% if profile.lat %>
	2	+ <%= block_title block.title %>
	3	+ <div class='the-localization-map'>
	4	+ <img src="http://maps.google.com/maps/api/staticmap?center=<%=profile.lat%>,<%=profile.lng%>&zoom=<%=block.zoom%>&size=190x250&maptype=<%=block.map_type%>&markers=<%=profile.lat%>,<%=profile.lng%>&sensor=false"/>
	5	+ </div>
	6	+</div>
	7	+<% else %>
	8	+ <i><%= _('This profile has no geographical position registered.') %></i>
	9	+<% end %>
	@@ -56,7 +56,7 @@		@@ -56,7 +56,7 @@
56	<div>	56	<div>
57	<div class="arrow"></div>	57	<div class="arrow"></div>
58	<div class="content" id="product-price-composition">	58	<div class="content" id="product-price-composition">
59	- <% product.inputs.each do \|i\| %>	59	+ <% product.inputs.relevant_to_price.each do \|i\| %>
60	<div class="search-product-input-dots-to-price">	60	<div class="search-product-input-dots-to-price">
61	<div class="search-product-input-name"><%= i.product_category.name %></div>	61	<div class="search-product-input-name"><%= i.product_category.name %></div>
62	<%= price_span i.cost, :class => 'search-product-input-price' %>	62	<%= price_span i.cost, :class => 'search-product-input-price' %>
	@@ -12,7 +12,7 @@		@@ -12,7 +12,7 @@
12	<%= labelled_form_field _('ZIP code'), text_field(:profile_data, :zip_code) %>	12	<%= labelled_form_field _('ZIP code'), text_field(:profile_data, :zip_code) %>
13	<%= labelled_form_field _('Address (street and number)'), text_field(:profile_data, :address) %>	13	<%= labelled_form_field _('Address (street and number)'), text_field(:profile_data, :address) %>
14	<% button_bar do %>	14	<% button_bar do %>
15	- <%= button_to_function :search, _('Locate in the map'), "codeAddress()", :title => _("Locate the address informed above in the map below (note that you'll probably need to adjust the marker to get a precise position)") %>	15	+ <%= button_to_function :search, _('Locate in the map'), "addressToPoint()", :title => _("Locate the address informed above in the map below (note that you'll probably need to adjust the marker to get a precise position)") %>
16	<%= submit_button 'save', _('Save') %>	16	<%= submit_button 'save', _('Save') %>
17	<%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>	17	<%= button(:back, _('Back to control panel'), :controller => 'profile_editor') %>
18	<% end %>	18	<% end %>
	@@ -27,9 +27,9 @@		@@ -27,9 +27,9 @@
27	<% end %>	27	<% end %>
28		28
29	<% if product.price_described? %>	29	<% if product.price_described? %>
30	- <% title = (product.inputs + product.price_details).map{ \|i\|	30	+ <% title = (product.inputs.relevant_to_price + product.price_details).map{ \|i\|
31	'<div class="search-product-input-dots-to-price">' +	31	'<div class="search-product-input-dots-to-price">' +
32	- '<div class="search-product-input-name">' + i.product_category.name + '</div>' +	32	+ '<div class="search-product-input-name">' + i.name + '</div>' +
33	price_span(i.price, :class => 'search-product-input-price') +	33	price_span(i.price, :class => 'search-product-input-price') +
34	'</div>' }.join('') %>	34	'</div>' }.join('') %>
35	<%= link_to_function _("Open Price"), '', :title => title, :class => "search-product-price-details" %>	35	<%= link_to_function _("Open Price"), '', :title => title, :class => "search-product-price-details" %>
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+class SetActivationCodeToNilIfAlreadyActivated < ActiveRecord::Migration
	2	+ def self.up
	3	+ update("UPDATE users SET activation_code = null WHERE activated_at IS NOT NULL")
	4	+ end
	5	+
	6	+ def self.down
	7	+ say('Can not be reverted.')
	8	+ end
	9	+end
@@ -0,0 +1,14 @@		@@ -0,0 +1,14 @@
	1	+class RemoveActionTrackerWithTargetNil < ActiveRecord::Migration
	2	+ def self.up
	3	+ select_all("SELECT id FROM action_tracker").each do \|tracker\|
	4	+ activity = ActionTracker::Record.find_by_id(tracker['id'])
	5	+ if activity && activity.target.nil?
	6	+ activity.destroy
	7	+ end
	8	+ end
	9	+ end
	10	+
	11	+ def self.down
	12	+ say "this migration can't be reverted"
	13	+ end
	14	+end