Download as
Browse Code »

Commit 6c114d19fdd68478b9612111c345b356486b5adf

Authored by Braulio Bhavamitra
1 parent b439f1f7
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

favorite_enterprises: fix typo (fix product_test)

Showing 5 changed files with 8 additions and 8 deletions   Show diff stats
app/controllers/my_profile/favorite_enterprises_controller.rb
  Diff comments   View file @6c114d1
1 1 class FavoriteEnterprisesController < MyProfileController
2   -
3   -# protect 'manage_favorite_enteprises', :profile
  2 +
  3 +# protect 'manage_favorite_enterprises', :profile
4 4  
5 5 requires_profile_class Person
6   -
  6 +
7 7 def index
8 8 @favorite_enterprises = profile.favorite_enterprises
9 9 end
... ... @@ -12,7 +12,7 @@ class FavoriteEnterprisesController &lt; MyProfileController
12 12 @favorite_enterprise = Enterprise.find(params[:id])
13 13 if request.post? && params[:confirmation]
14 14 profile.favorite_enterprises << @favorite_enterprise
15   - redirect_to :action => 'index'
  15 + redirect_to :action => 'index'
16 16 end
17 17 end
18 18  
... ...
doc/noosfero/navigation/searching-enterprises.textile
  Diff comments   View file @6c114d1
... ... @@ -14,7 +14,7 @@ p. Find on top of page the term &quot;Enterprises&quot; and click on it:
14 14 h2(#description). Description
15 15  
16 16 # Fill in the search field with what you want to look for and click on "Search" !=/images/doc/enterprises-search-field.en.png(Enterprises search field)!
17   -# Then you will see the search results. To see more results, click on the pages below the search results. !=/images/doc/enterprises-search-results-with-example.en.png(Enteprises search results with example)!
  17 +# Then you will see the search results. To see more results, click on the pages below the search results. !=/images/doc/enterprises-search-results-with-example.en.png(Enterprises search results with example)!
18 18 # Clicking on one of the search results, you will be redirected to the homepage of choosen enterprise.
19 19  
20 20 h3. More options
... ...
lib/notify_activity_to_profiles_job.rb
  Diff comments   View file @6c114d1
... ... @@ -25,7 +25,7 @@ class NotifyActivityToProfilesJob &lt; Struct.new(:tracked_action_id)
25 25 if tracked_action.user.is_a? Organization
26 26 ActionTrackerNotification.connection.execute "insert into action_tracker_notifications(profile_id, action_tracker_id) " +
27 27 "select distinct accessor_id, #{tracked_action.id} from role_assignments where resource_id = #{tracked_action.user.id} and resource_type='Profile' " +
28   - if tracked_action.user.is_a? Enterprise then "union select distinct person_id, #{tracked_action.id} from favorite_enteprises_people where enterprise_id = #{tracked_action.user.id}" else "" end
  28 + if tracked_action.user.is_a? Enterprise then "union select distinct person_id, #{tracked_action.id} from favorite_enterprise_people where enterprise_id = #{tracked_action.user.id}" else "" end
29 29 end
30 30  
31 31 if target.is_a?(Community)
... ...
po/noosfero-doc.pot
  Diff comments   View file @6c114d1
... ... @@ -2762,7 +2762,7 @@ msgstr &quot;&quot;
2762 2762  
2763 2763 #. type: Attribute 'alt' of: <ol><li><img>
2764 2764 #: doc/noosfero/navigation/searching-enterprises.en.xhtml:14 doc/noosfero/navigation/searching-enterprises.en.xhtml:14
2765   -msgid "Enteprises search results with example"
  2765 +msgid "Enterprises search results with example"
2766 2766 msgstr ""
2767 2767  
2768 2768 #. type: Content of: <ol><li>
... ...
test/unit/category_test.rb
  Diff comments   View file @6c114d1
... ... @@ -326,7 +326,7 @@ class CategoryTest &lt; ActiveSupport::TestCase
326 326 assert_equivalent [c1, c2], c.communities
327 327 end
328 328  
329   - should 'have products through enteprises' do
  329 + should 'have products through enterprises' do
330 330 product_category = fast_create(ProductCategory, :name => 'Products', :environment_id => Environment.default.id)
331 331 c = @env.categories.build(:name => 'my category'); c.save!
332 332 ent1 = fast_create(Enterprise, :identifier => 'enterprise_1', :name => 'Enterprise one')
... ...