Download as
Browse Code »

Commit 7d89d1f36f0b28b046bb197d37809db87c63826f

Authored by Victor Costa
1 parent 5e19d44c
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

rails3: fix manage_products_controller tests

Showing 3 changed files with 3 additions and 3 deletions   Show diff stats
app/controllers/my_profile/manage_products_controller.rb
  Diff comments   View file @7d89d1f
@@ -207,7 +207,7 @@ class ManageProductsController < ApplicationController @@ -207,7 +207,7 @@ class ManageProductsController < ApplicationController
207 }.to_json 207 }.to_json
208 else 208 else
209 render :text => {:ok => false, 209 render :text => {:ok => false,
210 - :error_msg => _(cost.errors['name']) % {:fn => _('Name')} 210 + :error_msg => _(cost.errors['name'].join('\n')) % {:fn => _('Name')}
211 }.to_json 211 }.to_json
212 end 212 end
213 end 213 end
app/helpers/manage_products_helper.rb
  Diff comments   View file @7d89d1f
@@ -163,7 +163,7 @@ module ManageProductsHelper @@ -163,7 +163,7 @@ module ManageProductsHelper
163 def cancel_edit_product_link(product, field, html_options = {}) 163 def cancel_edit_product_link(product, field, html_options = {})
164 return '' unless (user && user.has_permission?('manage_products', profile)) 164 return '' unless (user && user.has_permission?('manage_products', profile))
165 button_to_function(:cancel, _('Cancel'), nil, html_options) do |page| 165 button_to_function(:cancel, _('Cancel'), nil, html_options) do |page|
166 - page.replace_html "product-#{field}", :partial => "display_#{field}", :locals => {:product => product} 166 + page.replace_html "product-#{field}", CGI::escapeHTML(render :partial => "display_#{field}", :locals => {:product => product})
167 end 167 end
168 end 168 end
169 169
app/models/product.rb
  Diff comments   View file @7d89d1f
@@ -11,7 +11,7 @@ class Product < ActiveRecord::Base @@ -11,7 +11,7 @@ class Product < ActiveRecord::Base
11 11
12 SEARCH_DISPLAYS = %w[map full] 12 SEARCH_DISPLAYS = %w[map full]
13 13
14 - attr_accessible :name, :product_category, :highlighted, :price, :enterprise 14 + attr_accessible :name, :product_category, :highlighted, :price, :enterprise, :image_builder, :description
15 15
16 def self.default_search_display 16 def self.default_search_display
17 'full' 17 'full'