Download as
Browse Code »

Commit d6f15e0281d3eae7963462423e47475e7fc46a2a

Authored by JoenioCosta
1 parent ef44b634
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

ActionItem378: s/peform_task/perform_task/ 


git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1883 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 3 changed files with 6 additions and 6 deletions   Show diff stats
app/controllers/my_profile/tasks_controller.rb
  Diff comments   View file @d6f15e0
1 class TasksController < MyProfileController 1 class TasksController < MyProfileController
2 2
3 - protect 'peform_task', :profile 3 + protect 'perform_task', :profile
4 4
5 def index 5 def index
6 @tasks = profile.tasks.pending 6 @tasks = profile.tasks.pending
app/models/profile.rb
  Diff comments   View file @d6f15e0
@@ -30,7 +30,7 @@ class Profile &lt; ActiveRecord::Base @@ -30,7 +30,7 @@ class Profile &lt; ActiveRecord::Base
30 'manage_products' => N_('Manage products'), 30 'manage_products' => N_('Manage products'),
31 'manage_friends' => N_('Manage friends'), 31 'manage_friends' => N_('Manage friends'),
32 'validate_enterprise' => N_('Validate enterprise'), 32 'validate_enterprise' => N_('Validate enterprise'),
33 - 'peform_task' => N_('Peform task'), 33 + 'perform_task' => N_('Perform task'),
34 } 34 }
35 35
36 acts_as_accessible 36 acts_as_accessible
db/migrate/024_new_permissions.rb
  Diff comments   View file @d6f15e0
1 class NewPermissions < ActiveRecord::Migration 1 class NewPermissions < ActiveRecord::Migration
2 def self.up 2 def self.up
3 admin = Profile::Roles.admin 3 admin = Profile::Roles.admin
4 - admin.permissions += ['manage_friends', 'validate_enterprise', 'peform_task'] 4 + admin.permissions += ['manage_friends', 'validate_enterprise', 'perform_task']
5 admin.save 5 admin.save
6 6
7 moderator = Profile::Roles.moderator 7 moderator = Profile::Roles.moderator
8 - moderator.permissions += ['manage_friends', 'peform_task'] 8 + moderator.permissions += ['manage_friends', 'perform_task']
9 moderator.save 9 moderator.save
10 end 10 end
11 11
12 def self.down 12 def self.down
13 admin = Profile::Roles.admin 13 admin = Profile::Roles.admin
14 - admin.permissions -= ['manage_friends', 'validate_enterprise', 'peform_task'] 14 + admin.permissions -= ['manage_friends', 'validate_enterprise', 'perform_task']
15 admin.save 15 admin.save
16 16
17 moderator = Profile::Roles.moderator 17 moderator = Profile::Roles.moderator
18 - moderator.permissions -= ['manage_friends', 'peform_task'] 18 + moderator.permissions -= ['manage_friends', 'perform_task']
19 moderator.save 19 moderator.save
20 end 20 end
21 end 21 end