From f55f3ef9b63ee40b1f26025370bab66ab662c011 Mon Sep 17 00:00:00 2001 From: Victor Costa Date: Wed, 17 Jun 2015 14:23:54 -0300 Subject: [PATCH] Add new permission to manage email templates --- app/controllers/my_profile/email_templates_controller.rb | 2 +- app/models/profile.rb | 1 + test/functional/email_templates_controller_test.rb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/my_profile/email_templates_controller.rb b/app/controllers/my_profile/email_templates_controller.rb index 26e3eaf..6c0d25f 100644 --- a/app/controllers/my_profile/email_templates_controller.rb +++ b/app/controllers/my_profile/email_templates_controller.rb @@ -1,6 +1,6 @@ class EmailTemplatesController < MyProfileController - protect 'send_mail_to_members', :profile + protect 'manage_email_templates', :profile def index @email_templates = profile.email_templates diff --git a/app/models/profile.rb b/app/models/profile.rb index d0fee79..af6eb0b 100644 --- a/app/models/profile.rb +++ b/app/models/profile.rb @@ -79,6 +79,7 @@ class Profile < ActiveRecord::Base 'invite_members' => N_('Invite members'), 'send_mail_to_members' => N_('Send e-Mail to members'), 'manage_custom_roles' => N_('Manage custom roles'), + 'manage_email_templates' => N_('Manage Email Templates'), } acts_as_accessible diff --git a/test/functional/email_templates_controller_test.rb b/test/functional/email_templates_controller_test.rb index 5718a1b..c6edda9 100644 --- a/test/functional/email_templates_controller_test.rb +++ b/test/functional/email_templates_controller_test.rb @@ -5,7 +5,7 @@ class EmailTemplatesControllerTest < ActionController::TestCase setup do @profile = fast_create(Community) @email_template = EmailTemplate.create!(:name => 'template', :owner => @profile) - @person = create_user_with_permission('templatemanager', 'send_mail_to_members', @profile) + @person = create_user_with_permission('templatemanager', 'manage_email_templates', @profile) login_as(@person.user.login) end -- libgit2 0.21.2