Download as
Browse Code »

Commit 500752ef8fd1e0e655d9f6054dab965c7c848cec

Authored by Joenio Costa
Committed by Daniela Feitosa
1 parent 88adb34e
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

Link to enterprise products point to manage_products controller 

- No more to 'catalog' controller
  But this will change in ActionItem1469

(ActionItem1907)
Showing 2 changed files with 7 additions and 1 deletions   Show diff stats
app/helpers/search_helper.rb
  Diff comments   View file @500752e
@@ -65,7 +65,7 @@ module SearchHelper @@ -65,7 +65,7 @@ module SearchHelper
65 data << content_tag('strong', _('Address: ')) + profile.address + '<br/>' 65 data << content_tag('strong', _('Address: ')) + profile.address + '<br/>'
66 end 66 end
67 unless profile.products.empty? 67 unless profile.products.empty?
68 - data << content_tag('strong', _('Products/Services: ')) + profile.products.map{|i| link_to(i.name, :controller => 'catalog', :profile => profile.identifier, :action => 'show', :id => i.id)}.join(', ') + '<br/>' 68 + data << content_tag('strong', _('Products/Services: ')) + profile.products.map{|i| link_to(i.name, :controller => 'manage_products', :profile => profile.identifier, :action => 'show', :id => i.id)}.join(', ') + '<br/>'
69 end 69 end
70 if profile.respond_to?(:distance) and !profile.distance.nil? 70 if profile.respond_to?(:distance) and !profile.distance.nil?
71 data << content_tag('strong', _('Distance: ')) + "%.2f%" % profile.distance + '<br/>' 71 data << content_tag('strong', _('Distance: ')) + "%.2f%" % profile.distance + '<br/>'
test/functional/catalog_controller_test.rb
  Diff comments   View file @500752e
@@ -87,4 +87,10 @@ class CatalogControllerTest &lt; Test::Unit::TestCase @@ -87,4 +87,10 @@ class CatalogControllerTest &lt; Test::Unit::TestCase
87 assert_tag :a, :attributes => { :href => "http://" + url}, :content => url.scan(/.{4}/).join('&#x200B;') 87 assert_tag :a, :attributes => { :href => "http://" + url}, :content => url.scan(/.{4}/).join('&#x200B;')
88 end 88 end
89 89
  90 + should 'show action moved to manage_products controller' do
  91 + assert_raise ActionController::RoutingError do
  92 + get :show, :id => 1
  93 + end
  94 + end
  95 +
90 end 96 end