Commit 6c114d19fdd68478b9612111c345b356486b5adf
1 parent
b439f1f7
Exists in
master
and in
22 other branches
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
| 1 | class FavoriteEnterprisesController < MyProfileController | 1 | class FavoriteEnterprisesController < MyProfileController |
| 2 | - | ||
| 3 | -# protect 'manage_favorite_enteprises', :profile | 2 | + |
| 3 | +# protect 'manage_favorite_enterprises', :profile | ||
| 4 | 4 | ||
| 5 | requires_profile_class Person | 5 | requires_profile_class Person |
| 6 | - | 6 | + |
| 7 | def index | 7 | def index |
| 8 | @favorite_enterprises = profile.favorite_enterprises | 8 | @favorite_enterprises = profile.favorite_enterprises |
| 9 | end | 9 | end |
| @@ -12,7 +12,7 @@ class FavoriteEnterprisesController < MyProfileController | @@ -12,7 +12,7 @@ class FavoriteEnterprisesController < MyProfileController | ||
| 12 | @favorite_enterprise = Enterprise.find(params[:id]) | 12 | @favorite_enterprise = Enterprise.find(params[:id]) |
| 13 | if request.post? && params[:confirmation] | 13 | if request.post? && params[:confirmation] |
| 14 | profile.favorite_enterprises << @favorite_enterprise | 14 | profile.favorite_enterprises << @favorite_enterprise |
| 15 | - redirect_to :action => 'index' | 15 | + redirect_to :action => 'index' |
| 16 | end | 16 | end |
| 17 | end | 17 | end |
| 18 | 18 |
doc/noosfero/navigation/searching-enterprises.textile
| @@ -14,7 +14,7 @@ p. Find on top of page the term "Enterprises" and click on it: | @@ -14,7 +14,7 @@ p. Find on top of page the term "Enterprises" and click on it: | ||
| 14 | h2(#description). Description | 14 | h2(#description). Description |
| 15 | 15 | ||
| 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)! | 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 | # Clicking on one of the search results, you will be redirected to the homepage of choosen enterprise. | 18 | # Clicking on one of the search results, you will be redirected to the homepage of choosen enterprise. |
| 19 | 19 | ||
| 20 | h3. More options | 20 | h3. More options |
lib/notify_activity_to_profiles_job.rb
| @@ -25,7 +25,7 @@ class NotifyActivityToProfilesJob < Struct.new(:tracked_action_id) | @@ -25,7 +25,7 @@ class NotifyActivityToProfilesJob < Struct.new(:tracked_action_id) | ||
| 25 | if tracked_action.user.is_a? Organization | 25 | if tracked_action.user.is_a? Organization |
| 26 | ActionTrackerNotification.connection.execute "insert into action_tracker_notifications(profile_id, action_tracker_id) " + | 26 | ActionTrackerNotification.connection.execute "insert into action_tracker_notifications(profile_id, action_tracker_id) " + |
| 27 | "select distinct accessor_id, #{tracked_action.id} from role_assignments where resource_id = #{tracked_action.user.id} and resource_type='Profile' " + | 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 | end | 29 | end |
| 30 | 30 | ||
| 31 | if target.is_a?(Community) | 31 | if target.is_a?(Community) |
po/noosfero-doc.pot
| @@ -2762,7 +2762,7 @@ msgstr "" | @@ -2762,7 +2762,7 @@ msgstr "" | ||
| 2762 | 2762 | ||
| 2763 | #. type: Attribute 'alt' of: <ol><li><img> | 2763 | #. type: Attribute 'alt' of: <ol><li><img> |
| 2764 | #: doc/noosfero/navigation/searching-enterprises.en.xhtml:14 doc/noosfero/navigation/searching-enterprises.en.xhtml:14 | 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 | msgstr "" | 2766 | msgstr "" |
| 2767 | 2767 | ||
| 2768 | #. type: Content of: <ol><li> | 2768 | #. type: Content of: <ol><li> |
test/unit/category_test.rb
| @@ -326,7 +326,7 @@ class CategoryTest < ActiveSupport::TestCase | @@ -326,7 +326,7 @@ class CategoryTest < ActiveSupport::TestCase | ||
| 326 | assert_equivalent [c1, c2], c.communities | 326 | assert_equivalent [c1, c2], c.communities |
| 327 | end | 327 | end |
| 328 | 328 | ||
| 329 | - should 'have products through enteprises' do | 329 | + should 'have products through enterprises' do |
| 330 | product_category = fast_create(ProductCategory, :name => 'Products', :environment_id => Environment.default.id) | 330 | product_category = fast_create(ProductCategory, :name => 'Products', :environment_id => Environment.default.id) |
| 331 | c = @env.categories.build(:name => 'my category'); c.save! | 331 | c = @env.categories.build(:name => 'my category'); c.save! |
| 332 | ent1 = fast_create(Enterprise, :identifier => 'enterprise_1', :name => 'Enterprise one') | 332 | ent1 = fast_create(Enterprise, :identifier => 'enterprise_1', :name => 'Enterprise one') |