Download as
Browse Code »

Commit 122ef265aa38e9cd70bef031f353adc1f6cbbd4d

Authored by Victor Costa
2 parents cbe76440 f55f3ef9
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'email_template' into production

Showing 3 changed files with 3 additions and 2 deletions   Show diff stats
app/controllers/my_profile/email_templates_controller.rb
  Diff comments   View file @122ef26
1 class EmailTemplatesController < MyProfileController 1 class EmailTemplatesController < MyProfileController
2 2
3 - protect 'send_mail_to_members', :profile 3 + protect 'manage_email_templates', :profile
4 4
5 def index 5 def index
6 @email_templates = profile.email_templates 6 @email_templates = profile.email_templates
app/models/profile.rb
  Diff comments   View file @122ef26
@@ -107,6 +107,7 @@ class Profile &lt; ActiveRecord::Base @@ -107,6 +107,7 @@ class Profile &lt; ActiveRecord::Base
107 'invite_members' => N_('Invite members'), 107 'invite_members' => N_('Invite members'),
108 'send_mail_to_members' => N_('Send e-Mail to members'), 108 'send_mail_to_members' => N_('Send e-Mail to members'),
109 'manage_custom_roles' => N_('Manage custom roles'), 109 'manage_custom_roles' => N_('Manage custom roles'),
  110 + 'manage_email_templates' => N_('Manage Email Templates'),
110 } 111 }
111 112
112 acts_as_accessible 113 acts_as_accessible
test/functional/email_templates_controller_test.rb
  Diff comments   View file @122ef26
@@ -5,7 +5,7 @@ class EmailTemplatesControllerTest &lt; ActionController::TestCase @@ -5,7 +5,7 @@ class EmailTemplatesControllerTest &lt; ActionController::TestCase
5 setup do 5 setup do
6 @profile = fast_create(Community) 6 @profile = fast_create(Community)
7 @email_template = EmailTemplate.create!(:name => 'template', :owner => @profile) 7 @email_template = EmailTemplate.create!(:name => 'template', :owner => @profile)
8 - @person = create_user_with_permission('templatemanager', 'send_mail_to_members', @profile) 8 + @person = create_user_with_permission('templatemanager', 'manage_email_templates', @profile)
9 login_as(@person.user.login) 9 login_as(@person.user.login)
10 end 10 end
11 11