Merge commit 'refs/merge-requests/328' of git://gitorious.org/noosfero/noosfero …

…into merge-requests/328 Conflicts: app/controllers/public/catalog_controller.rb

Merge commit 'refs/merge-requests/328' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/328 Conflicts: app/controllers/public/catalog_controller.rb
Rodrigo Souto
2 parents 4251dcbc 5a86933d
Showing 24 changed files with 92 additions and 49 deletions Show diff stats
app/controllers/my_profile/manage_products_controller.rb
app/controllers/my_profile/profile_design_controller.rb
app/controllers/public/catalog_controller.rb
app/models/enterprise.rb
app/models/environment.rb
app/models/price_detail.rb
app/models/product.rb
app/views/blocks/profile_info.rhtml
app/views/content_viewer/_enterprise_homepage.rhtml
app/views/manage_products/_display_price_details.rhtml
app/views/manage_products/_edit_price_details.rhtml
app/views/manage_products/_manage_product_details.rhtml
app/views/profile/_organization_profile.rhtml
app/views/profile_editor/index.rhtml
db/migrate/20130529155000_rename_environment_setting_disable_products.rb
public/javascripts/manage-products.js
public/stylesheets/application.css
test/functional/catalog_controller_test.rb
test/functional/manage_products_controller_test.rb
test/functional/profile_controller_test.rb
@@ -6,10 +6,10 @@ class ManageProductsController &lt; ApplicationController
   before_filter :login_required, :except => [:show]
   before_filter :create_product?, :only => [:new]
-  protected  
+  protected
   def check_environment_feature
-    if profile.environment.enabled?('disable_products_for_enterprises')
+    unless profile.environment.enabled?('products_for_enterprises')
       render_not_found
       return
     end
@@ -38,7 +38,7 @@ class ProfileDesignController &lt; BoxOrganizerController
     end
     # product block exclusive for enterprises in environments that permits it
-    if profile.enterprise? && !profile.environment.enabled?('disable_products_for_enterprises')
+    if profile.enterprise? && profile.environment.enabled?('products_for_enterprises')
       blocks << ProductsBlock
     end
@@ -12,7 +12,7 @@ class CatalogController &lt; PublicController
   protected
   def check_enterprise_and_environment
-    unless profile.kind_of?(Enterprise) && !profile.environment.enabled?('disable_products_for_enterprises')
+    unless profile.kind_of?(Enterprise) && @profile.environment.enabled?('products_for_enterprises')
       redirect_to :controller => 'profile', :profile => profile.identifier, :action => 'index'
     end
   end
@@ -134,7 +134,7 @@ class Enterprise &lt; Organization
       [ProfileImageBlock.new, LinkListBlock.new(:links => links)],
       []
     ]
-    if !environment.enabled?('disable_products_for_enterprises')
+    if environment.enabled?('products_for_enterprises')
       blocks[2].unshift ProductsBlock.new
     end
     blocks
@@ -95,7 +95,6 @@ class Environment &lt; ActiveRecord::Base
       'disable_asset_communities' => __('Disable search for communities'),
       'disable_asset_products' => _('Disable search for products'),
       'disable_asset_events' => _('Disable search for events'),
-      'disable_products_for_enterprises' => __('Disable products for enterprises'),
       'disable_categories' => _('Disable categories'),
       'disable_header_and_footer' => _('Disable header/footer editing by users'),
       'disable_gender_icon' => _('Disable gender icon'),
@@ -103,9 +102,13 @@ class Environment &lt; ActiveRecord::Base
       'disable_select_city_for_contact' => _('Disable state/city select for contact form'),
       'disable_contact_person' => _('Disable contact for people'),
       'disable_contact_community' => _('Disable contact for groups/communities'),
-      'enterprise_registration' => __('Enterprise registration'),
+      'products_for_enterprises' => __('Enable products for enterprises'),
+      'enterprise_registration' => __('Enterprise registration'),
       'enterprise_activation' => __('Enable activation of enterprises'),
+      'enterprises_are_disabled_when_created' => __('Enterprises are disabled when created'),
+      'enterprises_are_validated_when_created' => __('Enterprises are validated when created'),
+
       'media_panel' => _('Media panel in WYSIWYG editor'),
       'select_preferred_domain' => _('Select preferred domains per profile'),
       'use_portal_community' => _('Use the portal as news source for front page'),
@@ -118,8 +121,6 @@ class Environment &lt; ActiveRecord::Base
       'organizations_are_moderated_by_default' => _("Organizations have moderated publication by default"),
       'enable_organization_url_change' => _("Allow organizations to change their URL"),
       'admin_must_approve_new_communities' => _("Admin must approve creation of communities"),
-      'enterprises_are_disabled_when_created' => __('Enterprises are disabled when created'),
-      'enterprises_are_validated_when_created' => __('Enterprises are validated when created'),
       'show_balloon_with_profile_links_when_clicked' => _('Show a balloon with profile links when a profile image is clicked'),
       'xmpp_chat' => _('XMPP/Jabber based chat'),
       'show_zoom_button_on_article_images' => _('Show a zoom link on all article images'),
@@ -281,8 +282,9 @@ class Environment &lt; ActiveRecord::Base
   end
   # Enables a feature identified by its name
-  def enable(feature)
+  def enable(feature, must_save=true)
     self.settings["#{feature}_enabled".to_sym] = true
+    self.save! if must_save
   end
   def enable_plugin(plugin)
@@ -292,8 +294,9 @@ class Environment &lt; ActiveRecord::Base
   end
   # Disables a feature identified by its name
-  def disable(feature)
+  def disable(feature, must_save=true)
     self.settings["#{feature}_enabled".to_sym] = false
+    self.save! if must_save
   end
   def disable_plugin(plugin)
@@ -337,7 +340,7 @@ class Environment &lt; ActiveRecord::Base
     %w(
       disable_asset_products
       disable_gender_icon
-      disable_products_for_enterprises
+      products_for_enterprises
       disable_select_city_for_contact
       enterprise_registration
       media_panel
@@ -345,7 +348,7 @@ class Environment &lt; ActiveRecord::Base
       show_balloon_with_profile_links_when_clicked
       use_portal_community
     ).each do |feature|
-      enable(feature)
+      enable(feature, false)
     end
   end
@@ -4,11 +4,11 @@ class PriceDetail &lt; ActiveRecord::Base
   validates_presence_of :product_id
   belongs_to :production_cost
-  validates_presence_of :production_cost
+  # Do not validates_presence_of production_cost. We may have undefined other costs.
   validates_uniqueness_of :production_cost_id, :scope => :product_id
   def name
-    production_cost.name
+    production_cost.nil? ? _('Other costs') : production_cost.name
   end
   def price
@@ -191,11 +191,13 @@ class Product &lt; ActiveRecord::Base
     (price - total_production_cost.to_f).zero?
   end
-  def update_price_details(price_details)
-    self.price_details.destroy_all
-    price_details.each do |price_detail|
-      self.price_details.create(price_detail)
+  def update_price_details(new_price_details)
+    price_details.destroy_all
+    new_price_details.each do |detail|
+      price_details.create(detail)
     end
+    reload # to remove temporary duplicated price_details
+    price_details
   end
   def price_description_percentage
@@ -17,7 +17,7 @@
 <ul class="profile-info-data" id="profile-info-data-<%= block.id %>">
   <li><%= link_to __('Homepage'), block.owner.url, :class => 'url' %></li>
   <li><%= link_to _('View profile'), block.owner.public_profile_url %></li>
-  <% if block.owner.enterprise? && !block.owner.environment.enabled?('disable_products_for_enterprises') %>
+  <% if block.owner.enterprise? && block.owner.environment.enabled?('products_for_enterprises') %>
     <li><%= link_to(_('Products/Services'), :controller => 'catalog', :profile => block.owner.identifier) %></li>
   <% end %>
   <li id="profile-admin-url-<%= block.id %>"></li>
 <%= display_profile_info enterprise_homepage.profile %>
 <div><%= enterprise_homepage.body %></div>
-<%= render :file => 'catalog/index' unless enterprise_homepage.profile.environment.enabled?('disable_products_for_enterprises') %>
+<%= render :file => 'catalog/index' if enterprise_homepage.profile.environment.enabled?('products_for_enterprises') %>
@@ -10,7 +10,7 @@
     </li>
     <% @product.price_details.each do |price_detail| %>
       <li>
-        <div class='price-detail-name'><%= "%s:" % price_detail.production_cost.name %></div>
+        <div class='price-detail-name'><%= "%s:" % price_detail.name %></div>
         <div class='price-detail-price'><%= float_to_currency(price_detail.price) %></div>
       </li>
     <% end %>
 <% price_details.each do |price_detail| %>
   <tr id='<%= "price-detail-#{price_detail.id}" %>'>
     <td><%= select_production_cost(@product, price_detail.production_cost_id) %></td>
-    <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', price_detail.formatted_value(:price), :class => 'numbers-only price-details-price')) %></td>
+    <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', price_detail.formatted_value(:price), :class => 'numbers-only price-details-price', :size => 6)) %></td>
     <td>
       <%= link_to_remote(_('Remove'),
                          :update => "price-detail-#{price_detail.id}",
@@ -34,7 +34,7 @@
   <table id='new-cost-fields'>
     <tr>
       <td><%= select_production_cost(@product) %></td>
-      <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', nil, :class => 'numbers-only price-details-price')) %></td>
+      <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', nil, :class => 'numbers-only price-details-price', :size => 6)) %></td>
       <td><%= link_to(_('Cancel'), '#', {:class => 'cancel-new-cost'}) %></td>
     </tr>
   </table>
@@ -19,7 +19,7 @@
     <td><%= show_date(profile.created_at) %></td>
   </tr>
-  <% if profile.kind_of?(Enterprise) && !profile.environment.enabled?('disable_products_for_enterprises') %>
+  <% if profile.kind_of?(Enterprise) && profile.environment.enabled?('products_for_enterprises') %>
     <tr>
       <td></td>
       <td>
@@ -45,7 +45,7 @@
   <%= control_panel_button(_('Manage Members'), 'members', :controller => 'profile_members') if profile.organization? && user.has_permission?(:manage_memberships, profile) %>
-  <%= control_panel_button(_('Manage Products and Services'), 'products', :controller => 'manage_products') if profile.enterprise? && !environment.enabled?('disable_products_for_enterprises') %>
+  <%= control_panel_button(_('Manage Products and Services'), 'products', :controller => 'manage_products') if profile.enterprise? && environment.enabled?('products_for_enterprises') %>
   <% if !environment.enabled?('disable_asset_enterprises') %>
     <% if profile.is_validation_entity? %>
@@ -0,0 +1,21 @@
+class RenameEnvironmentSettingDisableProducts < ActiveRecord::Migration
+  def self.up
+    select_all("select id from environments").each do |environment|
+      env = Environment.find(environment['id'])
+      env.settings[:products_for_enterprises_enabled] =
+         !env.settings[:disable_products_for_enterprises_enabled]
+      env.settings.delete :disable_products_for_enterprises_enabled
+      env.save!
+    end
+  end
+
+  def self.down
+    select_all("select id from environments").each do |environment|
+      env = Environment.find(environment['id'])
+      env.settings[:disable_products_for_enterprises_enabled] =
+         !env.settings[:products_for_enterprises_enabled]
+      env.settings.delete :products_for_enterprises_enabled
+      env.save!
+    end
+  end
+end
@@ -23,13 +23,24 @@
     return false;
   });
-  $("#manage-product-details-form").live('submit', function(data) {
+  $('#manage-product-details-form').live('submit', function(data) {
      var form = this;
      $(form).find('.loading-area').addClass('small-loading');
      $(form).css('cursor', 'progress');
-     $.post(form.action, $(form).serialize(), function(data) {
-       $("#display-manage-price-details").html(data);
-       $("#manage-product-details-button").show();
+     var request = $.ajax(form.action, {
+       type: 'POST',
+       dataType: 'html',
+       data: $(form).serialize()
+     });
+     request.done(function(data, textStatus, jqXHR) {
+       $('#display-manage-price-details').html(data);
+       $('#manage-product-details-button').show();
+     });
+     request.fail(function(jqXHR, textStatus, errorThrown) {
+       log.error('manage_product_details', 'Request failed', errorThrown);
+       alert('manage_product_details\nRequest failed: '+ errorThrown +
+             '\n\nPlease, contact the site administrator.');
+       $('#display-manage-price-details .loading-area').hide();
      });
      if ($('#progressbar-icon').hasClass('ui-icon-check')) {
        display_notice($('#progressbar-icon').attr('data-price-described-notice'));
@@ -3038,6 +3038,10 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
   display: inline-block;
 }
+#manage-product-details-form .formfieldline {
+  white-space: nowrap;
+}
+
 #manage-product-details-form .formlabel,
 #manage-product-details-form .formfield {
   display: inline-block;
@@ -10,6 +10,7 @@ class CatalogControllerTest &lt; ActionController::TestCase
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
+    Environment.default.enable('products_for_enterprises')
     @enterprise = fast_create(Enterprise, :name => 'My enterprise', :identifier => 'testent')
     @product_category = fast_create(ProductCategory)
   end
@@ -52,7 +53,7 @@ class CatalogControllerTest &lt; ActionController::TestCase
   should 'not give access if environment do not let' do
     env = Environment.default
-    env.enable('disable_products_for_enterprises')
+    env.disable('products_for_enterprises')
     env.save!
     ent = fast_create(Enterprise, :name => 'test ent', :identifier => 'test_ent', :environment_id => env.id)
     get :index, :profile => ent.identifier
@@ -13,6 +13,7 @@ class ManageProductsControllerTest &lt; ActionController::TestCase
     @enterprise = fast_create(Enterprise, :name => 'teste', :identifier => 'test_ent')
     @user = create_user_with_permission('test_user', 'manage_products', @enterprise)
     @environment = @enterprise.environment
+    @environment.enable('products_for_enterprises')
     @product_category = fast_create(ProductCategory)
     login_as :test_user
   end
@@ -191,7 +192,7 @@ class ManageProductsControllerTest &lt; ActionController::TestCase
   should 'not let users in if environment do not let' do
     env = Environment.default
-    env.enable('disable_products_for_enterprises')
+    env.disable('products_for_enterprises')
     env.save!
     @enterprise.environment = env
     @enterprise.save!
@@ -9,7 +9,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     @controller = ProfileController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
-
+    Environment.default.enable('products_for_enterprises')
     @profile = create_user('testuser').person
   end
   attr_reader :profile
@@ -263,8 +263,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
   should 'not display "Products" link for enterprise if environment do not let' do
     env = Environment.default
-    env.enable('disable_products_for_enterprises')
-    env.save!
+    env.disable('products_for_enterprises')
     ent = fast_create(Enterprise, :name => 'my test enterprise', :identifier => 'my-test-enterprise', :enabled => false, :environment_id => env.id)
     get :index, :profile => 'my-test-enterprise'
@@ -395,7 +395,7 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
   should 'not allow products block if environment do not let' do
     env = Environment.default
-    env.enable('disable_products_for_enterprises')
+    env.disable('products_for_enterprises')
     env.save!
     ent = fast_create(Enterprise, :name => 'test ent', :identifier => 'test_ent', :environment_id => env.id)
     person = create_user_with_permission('test_user', 'edit_profile_design', ent)
@@ -530,6 +530,7 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
     environment = mock
     profile.stubs(:environment).returns(environment)
     environment.stubs(:enabled?).returns(true)
+    environment.stubs(:enabled?).with('products_for_enterprises').returns(false)
     @controller.stubs(:profile).returns(profile)
     @controller.stubs(:user).returns(profile)
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([])
@@ -546,7 +547,7 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
     profile.stubs(:is_admin?).with(anything).returns(false)
     environment = mock
     profile.stubs(:environment).returns(environment)
-    environment.stubs(:enabled?).returns(false)
+    environment.stubs(:enabled?).returns(true)
     @controller.stubs(:profile).returns(profile)
     @controller.stubs(:user).returns(profile)
     Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([])
@@ -559,7 +559,7 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
   should 'not list the manage products button if the environment disabled it' do
     env = Environment.default
-    env.enable('disable_products_for_enterprises')
+    env.disable('products_for_enterprises')
     env.save!
     ent = fast_create(Enterprise)
@@ -5,6 +5,7 @@ class EnterpriseTest &lt; ActiveSupport::TestCase
   def setup
     super
+    Environment.default.enable('products_for_enterprises')
     @product_category = fast_create(ProductCategory, :name => 'Products')
   end
@@ -80,9 +81,9 @@ class EnterpriseTest &lt; ActiveSupport::TestCase
   should 'create default set of blocks' do
     e = Enterprise.create(:name => 'my new community', :identifier => 'mynewcommunity')
-    assert !e.boxes[0].blocks.empty?, 'person must have blocks in area 1'
-    assert !e.boxes[1].blocks.empty?, 'person must have blocks in area 2'
-    assert !e.boxes[2].blocks.empty?, 'person must have blocks in area 3'
+    assert !e.boxes[0].blocks.empty?, 'enterprise must have blocks in area 1'
+    assert !e.boxes[1].blocks.empty?, 'enterprise must have blocks in area 2'
+    assert !e.boxes[2].blocks.empty?, 'enterprise must have blocks in area 3'
   end
   should 'allow to add new members if has no members' do
@@ -242,8 +243,7 @@ class EnterpriseTest &lt; ActiveSupport::TestCase
   should 'not create a products block for enterprise if environment do not let' do
     env = Environment.default
-    env.enable('disable_products_for_enterprises')
-    env.save!
+    env.disable('products_for_enterprises')
     ent = fast_create(Enterprise, :name => 'test ent', :identifier => 'test_ent')
     assert_not_includes ent.blocks.map(&:class), ProductsBlock
   end
@@ -50,14 +50,14 @@ class PriceDetailTest &lt; ActiveSupport::TestCase
     assert_equal cost, PriceDetail.find(detail.id).production_cost
   end
-  should 'production cost be mandatory' do
-    p = PriceDetail.new
-    p.valid?
-
-    assert p.errors.invalid?(:production_cost)
+  should 'production cost not be mandatory' do
+    product = fast_create(Product)
+    price = PriceDetail.new :product=>product
+    price.valid?
+    assert price.errors.empty?
   end
-  should 'th production cost be unique on scope of product' do
+  should 'the production cost be unique on scope of product' do
     product = fast_create(Product)
     cost = fast_create(ProductionCost, :owner_id => Environment.default.id, :owner_type => 'environment')
	@@ -6,10 +6,10 @@ class ManageProductsController < ApplicationController		@@ -6,10 +6,10 @@ class ManageProductsController < ApplicationController
6	before_filter :login_required, :except => [:show]	6	before_filter :login_required, :except => [:show]
7	before_filter :create_product?, :only => [:new]	7	before_filter :create_product?, :only => [:new]
8		8
9	- protected	9	+ protected
10		10
11	def check_environment_feature	11	def check_environment_feature
12	- if profile.environment.enabled?('disable_products_for_enterprises')	12	+ unless profile.environment.enabled?('products_for_enterprises')
13	render_not_found	13	render_not_found
14	return	14	return
15	end	15	end
	@@ -38,7 +38,7 @@ class ProfileDesignController < BoxOrganizerController		@@ -38,7 +38,7 @@ class ProfileDesignController < BoxOrganizerController
38	end	38	end
39		39
40	# product block exclusive for enterprises in environments that permits it	40	# product block exclusive for enterprises in environments that permits it
41	- if profile.enterprise? && !profile.environment.enabled?('disable_products_for_enterprises')	41	+ if profile.enterprise? && profile.environment.enabled?('products_for_enterprises')
42	blocks << ProductsBlock	42	blocks << ProductsBlock
43	end	43	end
44		44
	@@ -12,7 +12,7 @@ class CatalogController < PublicController		@@ -12,7 +12,7 @@ class CatalogController < PublicController
12	protected	12	protected
13		13
14	def check_enterprise_and_environment	14	def check_enterprise_and_environment
15	- unless profile.kind_of?(Enterprise) && !profile.environment.enabled?('disable_products_for_enterprises')	15	+ unless profile.kind_of?(Enterprise) && @profile.environment.enabled?('products_for_enterprises')
16	redirect_to :controller => 'profile', :profile => profile.identifier, :action => 'index'	16	redirect_to :controller => 'profile', :profile => profile.identifier, :action => 'index'
17	end	17	end
18	end	18	end
	@@ -134,7 +134,7 @@ class Enterprise < Organization		@@ -134,7 +134,7 @@ class Enterprise < Organization
134	[ProfileImageBlock.new, LinkListBlock.new(:links => links)],	134	[ProfileImageBlock.new, LinkListBlock.new(:links => links)],
135	[]	135	[]
136	]	136	]
137	- if !environment.enabled?('disable_products_for_enterprises')	137	+ if environment.enabled?('products_for_enterprises')
138	blocks[2].unshift ProductsBlock.new	138	blocks[2].unshift ProductsBlock.new
139	end	139	end
140	blocks	140	blocks
	@@ -4,11 +4,11 @@ class PriceDetail < ActiveRecord::Base		@@ -4,11 +4,11 @@ class PriceDetail < ActiveRecord::Base
4	validates_presence_of :product_id	4	validates_presence_of :product_id
5		5
6	belongs_to :production_cost	6	belongs_to :production_cost
7	- validates_presence_of :production_cost	7	+ # Do not validates_presence_of production_cost. We may have undefined other costs.
8	validates_uniqueness_of :production_cost_id, :scope => :product_id	8	validates_uniqueness_of :production_cost_id, :scope => :product_id
9		9
10	def name	10	def name
11	- production_cost.name	11	+ production_cost.nil? ? _('Other costs') : production_cost.name
12	end	12	end
13		13
14	def price	14	def price
	@@ -17,7 +17,7 @@		@@ -17,7 +17,7 @@
17	<ul class="profile-info-data" id="profile-info-data-<%= block.id %>">	17	<ul class="profile-info-data" id="profile-info-data-<%= block.id %>">
18	<li><%= link_to __('Homepage'), block.owner.url, :class => 'url' %></li>	18	<li><%= link_to __('Homepage'), block.owner.url, :class => 'url' %></li>
19	<li><%= link_to _('View profile'), block.owner.public_profile_url %></li>	19	<li><%= link_to _('View profile'), block.owner.public_profile_url %></li>
20	- <% if block.owner.enterprise? && !block.owner.environment.enabled?('disable_products_for_enterprises') %>	20	+ <% if block.owner.enterprise? && block.owner.environment.enabled?('products_for_enterprises') %>
21	<li><%= link_to(_('Products/Services'), :controller => 'catalog', :profile => block.owner.identifier) %></li>	21	<li><%= link_to(_('Products/Services'), :controller => 'catalog', :profile => block.owner.identifier) %></li>
22	<% end %>	22	<% end %>
23	<li id="profile-admin-url-<%= block.id %>"></li>	23	<li id="profile-admin-url-<%= block.id %>"></li>
1	<%= display_profile_info enterprise_homepage.profile %>	1	<%= display_profile_info enterprise_homepage.profile %>
2	<div><%= enterprise_homepage.body %></div>	2	<div><%= enterprise_homepage.body %></div>
3	-<%= render :file => 'catalog/index' unless enterprise_homepage.profile.environment.enabled?('disable_products_for_enterprises') %>	3	+<%= render :file => 'catalog/index' if enterprise_homepage.profile.environment.enabled?('products_for_enterprises') %>
	@@ -10,7 +10,7 @@		@@ -10,7 +10,7 @@
10	</li>	10	</li>
11	<% @product.price_details.each do \|price_detail\| %>	11	<% @product.price_details.each do \|price_detail\| %>
12	<li>	12	<li>
13	- <div class='price-detail-name'><%= "%s:" % price_detail.production_cost.name %></div>	13	+ <div class='price-detail-name'><%= "%s:" % price_detail.name %></div>
14	<div class='price-detail-price'><%= float_to_currency(price_detail.price) %></div>	14	<div class='price-detail-price'><%= float_to_currency(price_detail.price) %></div>
15	</li>	15	</li>
16	<% end %>	16	<% end %>
1	<% price_details.each do \|price_detail\| %>	1	<% price_details.each do \|price_detail\| %>
2	<tr id='<%= "price-detail-#{price_detail.id}" %>'>	2	<tr id='<%= "price-detail-#{price_detail.id}" %>'>
3	<td><%= select_production_cost(@product, price_detail.production_cost_id) %></td>	3	<td><%= select_production_cost(@product, price_detail.production_cost_id) %></td>
4	- <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', price_detail.formatted_value(:price), :class => 'numbers-only price-details-price')) %></td>	4	+ <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', price_detail.formatted_value(:price), :class => 'numbers-only price-details-price', :size => 6)) %></td>
5	<td>	5	<td>
6	<%= link_to_remote(_('Remove'),	6	<%= link_to_remote(_('Remove'),
7	:update => "price-detail-#{price_detail.id}",	7	:update => "price-detail-#{price_detail.id}",
	@@ -34,7 +34,7 @@		@@ -34,7 +34,7 @@
34	<table id='new-cost-fields'>	34	<table id='new-cost-fields'>
35	<tr>	35	<tr>
36	<td><%= select_production_cost(@product) %></td>	36	<td><%= select_production_cost(@product) %></td>
37	- <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', nil, :class => 'numbers-only price-details-price')) %></td>	37	+ <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', nil, :class => 'numbers-only price-details-price', :size => 6)) %></td>
38	<td><%= link_to(_('Cancel'), '#', {:class => 'cancel-new-cost'}) %></td>	38	<td><%= link_to(_('Cancel'), '#', {:class => 'cancel-new-cost'}) %></td>
39	</tr>	39	</tr>
40	</table>	40	</table>