Download as
Browse Code »

Commit d6f15e0281d3eae7963462423e47475e7fc46a2a

Authored by JoenioCosta
1 parent ef44b634
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

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 1 class TasksController < MyProfileController
2 2  
3   - protect 'peform_task', :profile
  3 + protect 'perform_task', :profile
4 4  
5 5 def index
6 6 @tasks = profile.tasks.pending
... ...
app/models/profile.rb
  Diff comments   View file @d6f15e0
... ... @@ -30,7 +30,7 @@ class Profile &lt; ActiveRecord::Base
30 30 'manage_products' => N_('Manage products'),
31 31 'manage_friends' => N_('Manage friends'),
32 32 'validate_enterprise' => N_('Validate enterprise'),
33   - 'peform_task' => N_('Peform task'),
  33 + 'perform_task' => N_('Perform task'),
34 34 }
35 35  
36 36 acts_as_accessible
... ...
db/migrate/024_new_permissions.rb
  Diff comments   View file @d6f15e0
1 1 class NewPermissions < ActiveRecord::Migration
2 2 def self.up
3 3 admin = Profile::Roles.admin
4   - admin.permissions += ['manage_friends', 'validate_enterprise', 'peform_task']
  4 + admin.permissions += ['manage_friends', 'validate_enterprise', 'perform_task']
5 5 admin.save
6 6  
7 7 moderator = Profile::Roles.moderator
8   - moderator.permissions += ['manage_friends', 'peform_task']
  8 + moderator.permissions += ['manage_friends', 'perform_task']
9 9 moderator.save
10 10 end
11 11  
12 12 def self.down
13 13 admin = Profile::Roles.admin
14   - admin.permissions -= ['manage_friends', 'validate_enterprise', 'peform_task']
  14 + admin.permissions -= ['manage_friends', 'validate_enterprise', 'perform_task']
15 15 admin.save
16 16  
17 17 moderator = Profile::Roles.moderator
18   - moderator.permissions -= ['manage_friends', 'peform_task']
  18 + moderator.permissions -= ['manage_friends', 'perform_task']
19 19 moderator.save
20 20 end
21 21 end
... ...