Merge branch 'email_template' into production

Conflicts: app/views/admin_panel/index.html.erb

Merge branch 'email_template' into production
Conflicts: app/views/admin_panel/index.html.erb
Victor Costa
2 parents f092d7d1 9fef020f
Showing 27 changed files with 376 additions and 157 deletions Show diff stats
app/controllers/admin/environment_email_templates_controller.rb
app/controllers/email_templates_controller.rb
app/controllers/my_profile/email_templates_controller.rb
app/controllers/my_profile/profile_email_templates_controller.rb
app/helpers/email_template_helper.rb
app/helpers/task_helper.rb
app/mailers/task_mailer.rb
app/mailers/user_mailer.rb
app/models/change_password.rb
app/models/email_template.rb
app/models/environment.rb
app/models/task.rb
app/views/admin_panel/index.html.erb
app/views/email_templates/_form.html.erb
app/views/email_templates/index.html.erb
app/views/email_templates/show.html.erb
app/views/profile/send_mail.html.erb
app/views/profile_editor/index.html.erb
test/fixtures/roles.yml
test/functional/email_templates_controller_test.rb
@@ -0,0 +1,15 @@
+class EnvironmentEmailTemplatesController < EmailTemplatesController
+
+  protect 'manage_email_templates', :environment
+
+  protected
+
+  def owner
+    environment
+  end
+
+  before_filter :only => :index do
+    @back_to = url_for(:controller => :admin_panel)
+  end
+
+end
@@ -0,0 +1,62 @@
+class EmailTemplatesController < ApplicationController
+
+  def index
+    @email_templates = owner.email_templates
+  end
+
+  def show
+    @email_template = owner.email_templates.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @email_template }
+    end
+  end
+
+  def show_parsed
+    @email_template = owner.email_templates.find(params[:id])
+    template_params = {:profile => owner, :environment => environment}
+    render json: {:parsed_body => @email_template.parsed_body(template_params), :parsed_subject => @email_template.parsed_subject(template_params)}
+  end
+
+  def new
+    @email_template = owner.email_templates.build(:owner => owner)
+  end
+
+  def edit
+    @email_template = owner.email_templates.find(params[:id])
+  end
+
+  def create
+    @email_template = owner.email_templates.build(params[:email_template])
+    @email_template.owner = owner
+
+    if @email_template.save
+      session[:notice] = _('Email template was successfully created.')
+      redirect_to url_for(:action => :index)
+    else
+      render action: "new"
+    end
+  end
+
+  def update
+    @email_template = owner.email_templates.find(params[:id])
+
+    if @email_template.update_attributes(params[:email_template])
+      session[:notice] = _('Email template was successfully updated.')
+      redirect_to url_for(:action => :index)
+    else
+      render action: "edit"
+    end
+  end
+
+  def destroy
+    @email_template = owner.email_templates.find(params[:id])
+    @email_template.destroy
+
+    respond_to do |format|
+      format.html { redirect_to url_for(:action => :index)}
+      format.json { head :no_content }
+    end
+  end
+end
@@ -1,63 +0,0 @@
-class EmailTemplatesController < MyProfileController
-
-  protect 'manage_email_templates', :profile
-
-  def index
-    @email_templates = profile.email_templates
-  end
-
-  def show
-    @email_template = profile.email_templates.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: @email_template }
-    end
-  end
-
-  def show_parsed
-    @email_template = profile.email_templates.find(params[:id])
-    template_params = {:profile => profile, :environment => environment}
-    render json: {:parsed_body => @email_template.parsed_body(template_params), :parsed_subject => @email_template.parsed_subject(template_params)}
-  end
-
-  def new
-    @email_template = profile.email_templates.build
-  end
-
-  def edit
-    @email_template = profile.email_templates.find(params[:id])
-  end
-
-  def create
-    @email_template = profile.email_templates.build(params[:email_template], :owner => profile)
-
-    if @email_template.save
-      session[:notice] = _('Email template was successfully created.')
-      redirect_to url_for(:action => :index)
-    else
-      render action: "new"
-    end
-  end
-
-  def update
-    @email_template = profile.email_templates.find(params[:id])
-
-    if @email_template.update_attributes(params[:email_template])
-      session[:notice] = _('Email template was successfully updated.')
-      redirect_to url_for(:action => :index)
-    else
-      render action: "edit"
-    end
-  end
-
-  def destroy
-    @email_template = profile.email_templates.find(params[:id])
-    @email_template.destroy
-
-    respond_to do |format|
-      format.html { redirect_to url_for(:action => :index)}
-      format.json { head :no_content }
-    end
-  end
-end
@@ -0,0 +1,16 @@
+class ProfileEmailTemplatesController < EmailTemplatesController
+
+  needs_profile
+  protect 'manage_email_templates', :profile
+
+  protected
+
+  def owner
+    profile
+  end
+
+  before_filter :only => :index do
+    @back_to = url_for(:controller => :profile_editor)
+  end
+
+end
@@ -0,0 +1,12 @@
+module EmailTemplateHelper
+
+  def mail_with_template(params={})
+    if params[:email_template].present?
+      params[:body] = params[:email_template].parsed_body(params[:template_params])
+      params[:subject] = params[:email_template].parsed_subject(params[:template_params])
+      params[:content_type] = "text/html"
+    end
+    mail(params.except(:email_template))
+  end
+
+end
@@ -5,7 +5,7 @@ module TaskHelper
  
     content_tag(
       :div,
-      labelled_form_field(description, select_tag("tasks[#{task.id}][task][email_template_id]", options_from_collection_for_select(email_templates, :id, :name), :include_blank => include_blank, 'data-url' => url_for(:controller => 'email_templates', :action => 'show_parsed', :profile => profile.identifier))),
+      labelled_form_field(description, select_tag("tasks[#{task.id}][task][email_template_id]", options_from_collection_for_select(email_templates, :id, :name), :include_blank => include_blank, 'data-url' => url_for(:controller => 'profile_email_templates', :action => 'show_parsed', :profile => profile.identifier))),
       :class => 'template-selection'
     )
   end
 class TaskMailer < ActionMailer::Base
  
+  include EmailTemplateHelper
+
   def target_notification(task, message)
     @message = extract_message(message)
     @target = task.target.name
@@ -33,15 +35,13 @@ class TaskMailer &lt; ActionMailer::Base
     @requestor = task.requestor.name
     @environment = task.requestor.environment.name
     @url = url_for(:host => task.requestor.environment.default_hostname, :controller => 'home')
-    @email_template = task.email_template
-    template_params = {:environment => task.requestor.environment, :task => task}
  
-    mail(
+    mail_with_template(
       to: task.requestor.notification_emails,
       from: self.class.generate_from(task),
-      subject: @email_template.present? ? @email_template.parsed_subject(template_params) : '[%s] %s' % [task.requestor.environment.name, task.target_notification_description],
-      body: @email_template.present? ? @email_template.parsed_body(template_params) : nil,
-      content_type: @email_template.present? ? "text/html" : nil
+      subject: '[%s] %s' % [task.requestor.environment.name, task.target_notification_description],
+      email_template: task.email_template,
+      template_params: {:environment => task.requestor.environment, :task => task, :message => @message, :url => @url, :requestor => task.requestor}
     )
   end
  
 class UserMailer < ActionMailer::Base
+
+  include EmailTemplateHelper
+
   def activation_email_notify(user)
     user_email = "#{user.login}@#{user.email_domain}"
     @name = user.name
@@ -22,10 +25,12 @@ class UserMailer &lt; ActionMailer::Base
     @redirection = (true if user.return_to)
     @join = (user.community_to_join if user.community_to_join)
  
-    mail(
+    mail_with_template(
       from: "#{user.environment.name} <#{user.environment.contact_email}>",
       to: user.email,
       subject: _("[%s] Activate your account") % [user.environment.name],
+      template_params: {:environment => user.environment, :activation_code => @activation_code, :redirection => @redirection, :join => @join},
+      email_template: user.environment.email_templates.find_by_template_type(:user_activation),
     )
   end
  
@@ -28,6 +28,13 @@ class ChangePassword &lt; Task
   validates_presence_of :password_confirmation, :on => :update, :if => lambda { |change| change.status != Task::Status::CANCELLED }
   validates_confirmation_of :password, :if => lambda { |change| change.status != Task::Status::CANCELLED }
  
+  before_save :set_email_template
+
+  def set_email_template
+    template = environment.email_templates.find_by_template_type(:user_change_password)
+    data[:email_template_id] = template.id unless template.nil?
+  end
+
   def environment
     requestor.environment unless requestor.nil?
   end
@@ -6,6 +6,10 @@ class EmailTemplate &lt; ActiveRecord::Base
  
   validates_presence_of :name
  
+  validates :name, uniqueness: { scope: [:owner_type, :owner_id] }
+
+  validates :template_type, uniqueness: { scope: [:owner_type, :owner_id] }, if: :unique_by_type?
+
   def parsed_body(params)
     @parsed_body ||= parse(body, params)
   end
@@ -14,12 +18,26 @@ class EmailTemplate &lt; ActiveRecord::Base
     @parsed_subject ||= parse(subject, params)
   end
  
+  def self.available_types
+    {
+      :task_rejection => {:description => _('Task Rejection'), :owner_type => Profile},
+      :task_acceptance => {:description => _('Task Acceptance'), :owner_type => Profile},
+      :organization_members => {:description => _('Organization Members'), :owner_type => Profile},
+      :user_activation => {:description => _('User Activation'), :unique => true, :owner_type => Environment},
+      :user_change_password => {:description => _('Change User Password'), :unique => true, :owner_type => Environment}
+    }
+  end
+
   def available_types
-    HashWithIndifferentAccess.new ({
-      :task_rejection => {:description => _('Task Rejection')},
-      :task_acceptance => {:description => _('Task Acceptance')},
-      :organization_members => {:description => _('Organization Members')}
-    })
+    HashWithIndifferentAccess.new EmailTemplate.available_types.select {|k, v| owner.kind_of?(v[:owner_type])}
+  end
+
+  def type_description
+    available_types.fetch(template_type, {})[:description]
+  end
+
+  def unique_by_type?
+    available_types.fetch(template_type, {})[:unique]
   end
  
   protected
@@ -21,6 +21,7 @@ class Environment &lt; ActiveRecord::Base
  
   has_many :tasks, :dependent => :destroy, :as => 'target'
   has_many :search_terms, :as => :context
+  has_many :email_templates, :foreign_key => :owner_id
  
   IDENTIFY_SCRIPTS = /(php[0-9s]?|[sp]htm[l]?|pl|py|cgi|rb)/
  
@@ -50,6 +51,7 @@ class Environment &lt; ActiveRecord::Base
     'manage_environment_licenses' => N_('Manage environment licenses'),
     'manage_environment_trusted_sites' => N_('Manage environment trusted sites'),
     'edit_appearance'      => N_('Edit appearance'),
+    'manage_email_templates' => N_('Manage Email Templates'),
   }
  
   module Roles
@@ -305,7 +305,8 @@ class Task &lt; ActiveRecord::Base
   def to_liquid
     HashWithIndifferentAccess.new({
       :requestor => requestor,
-      :reject_explanation => reject_explanation
+      :reject_explanation => reject_explanation,
+      :code => code
     })
   end
  
@@ -12,6 +12,7 @@
   <tr><td><%= link_to _('Licenses'), :controller =>'licenses' %></td></tr>
   <tr><td><%= link_to _('Trusted sites'), :controller =>'trusted_sites' %></td></tr>
   <tr><td><%= link_to _('Blocks'), :controller => 'features', :action => 'manage_blocks' %></td></tr>
+  <tr><td><%= link_to _('Email templates'), :controller =>'environment_email_templates' %></td></tr>
 </table>
  
 <h2><%= _('Profiles') %></h2>
-<%= form_for(@email_template, :url => {:controller => :email_templates, :action => @email_template.persisted? ? :update : :create, :id => @email_template.id}) do |f| %>
+<%= form_for(@email_template, :url => {:action => @email_template.persisted? ? :update : :create, :id => @email_template.id}) do |f| %>
  
   <%= error_messages_for :email_template if @email_template.errors.any? %>
  
@@ -25,7 +25,7 @@
  
   <div class="actions">
     <%= submit_button(:save, _('Save')) %>
-    <%= button(:back, _('Back'), :controller => :email_templates) %>
+    <%= button(:back, _('Back'), :action => :index) %>
   </div>
  
 <% end %>
@@ -11,10 +11,10 @@
   <% @email_templates.each do |email_template| %>
     <tr>
       <td><%= email_template.name %></td>
-      <td><%= email_template.available_types[email_template.template_type][:description] if email_template.template_type.present? %></td>
+      <td><%= email_template.type_description %></td>
       <td>
-        <%= button_without_text(:edit, _('Edit'), {:controller => :email_templates, :action => :edit, :id => email_template.id}) %>
-        <%= button_without_text(:remove, _('Remove'), {:controller => :email_templates, :action => :destroy, :id => email_template.id}, method: :delete, data: { confirm: 'Are you sure?' }) %>
+        <%= button_without_text(:edit, _('Edit'), {:action => :edit, :id => email_template.id}) %>
+        <%= button_without_text(:remove, _('Remove'), {:action => :destroy, :id => email_template.id}, method: :delete, data: { confirm: 'Are you sure?' }) %>
       </td>
     </tr>
   <% end %>
@@ -22,6 +22,6 @@
  
   <br />
  
-  <%= button(:new, _('New template'), :controller => :email_templates, :action => :new) %>
-  <%= button(:back, _('Back to control panel'), :controller => :profile_editor) %>
+  <%= button(:new, _('New template'), :action => :new) %>
+  <%= button(:back, _('Back'), @back_to) %>
 </div>
 <p id="notice"><%= notice %></p>
  
  
-<%= link_to 'Edit', url_for(:controller => :email_templates, :action => :edit, :id => @email_template.id) %> |
-<%= link_to 'Back', url_for(:controller => :email_templates) %>
+<%= link_to 'Edit', url_for(:action => :edit, :id => @email_template.id) %> |
+<%= link_to 'Back', url_for(:action => :index) %>
@@ -6,7 +6,7 @@
  
 <% if @email_templates.present? %>
   <div class="template-selection">
-    <%= labelled_form_field(_('Select a template:'), select_tag(:template, options_from_collection_for_select(@email_templates, :id, :name), :include_blank => true, 'data-url' => url_for(:controller => 'email_templates', :action => 'show_parsed'))) %>
+    <%= labelled_form_field(_('Select a template:'), select_tag(:template, options_from_collection_for_select(@email_templates, :id, :name), :include_blank => true, 'data-url' => url_for(:controller => 'profile_email_templates', :action => 'show_parsed'))) %>
   </div>
 <% end %>
  
@@ -72,7 +72,7 @@
  
   <%= control_panel_button(_('Edit welcome page'), 'welcome-page', :action => 'welcome_page') if has_welcome_page %>
  
-  <%= control_panel_button(_('Email Templates'), 'email-templates', :controller => :email_templates) if profile.organization? %>
+  <%= control_panel_button(_('Email Templates'), 'email-templates', :controller => :profile_email_templates) if profile.organization? %>
  
   <% @plugins.dispatch(:control_panel_buttons).each do |button| %>
     <%= control_panel_button(button[:title], button[:icon], button[:url], button[:html_options]) %>
@@ -38,6 +38,7 @@ four:
    - manage_environment_organizations
    - manage_environment_templates
    - manage_environment_licenses
+   - manage_email_templates
 profile_admin:
   id: 5
   environment_id: 1
@@ -60,6 +61,7 @@ profile_admin:
    - manage_friends
    - validate_enterprise
    - publish_content
+   - manage_email_templates
 profile_member:
   id: 6
   environment_id: 1
@@ -100,3 +102,4 @@ environment_administrator:
    - destroy_profile
    - manage_environment_templates
    - manage_environment_licenses
+   - manage_email_templates
@@ -1,68 +0,0 @@
-require 'test_helper'
-
-class EmailTemplatesControllerTest < ActionController::TestCase
-
-  setup do
-    @profile = fast_create(Community)
-    @email_template = EmailTemplate.create!(:name => 'template', :owner => @profile)
-    @person = create_user_with_permission('templatemanager', 'manage_email_templates', @profile)
-    login_as(@person.user.login)
-  end
-
-  attr_accessor :profile, :person
-
-  test "should get index" do
-    get :index, :profile => profile.identifier
-    assert_response :success
-    assert_not_nil assigns(:email_templates)
-  end
-
-  test "should get new" do
-    get :new, :profile => profile.identifier
-    assert_response :success
-  end
-
-  test "should create email_template" do
-    assert_difference('EmailTemplate.count') do
-      post :create, email_template: { :name => 'test' }, :profile => profile.identifier
-    end
-
-    assert_redirected_to url_for(:action => :index)
-  end
-
-  test "should show email_template" do
-    get :show, id: @email_template, :profile => profile.identifier
-    assert_response :success
-  end
-
-  test "should get edit" do
-    get :edit, id: @email_template, :profile => profile.identifier
-    assert_response :success
-  end
-
-  test "should update email_template" do
-    put :update, id: @email_template, email_template: {  }, :profile => profile.identifier
-    assert_redirected_to url_for(:action => :index)
-  end
-
-  test "should destroy email_template" do
-    assert_difference('EmailTemplate.count', -1) do
-      delete :destroy, id: @email_template, :profile => profile.identifier
-    end
-
-    assert_redirected_to url_for(:action => :index)
-  end
-
-  test "should get parsed template" do
-    environment = Environment.default
-    @email_template.subject = '{{profile.name}} - {{profile.identifier}}'
-    @email_template.body = '{{profile.name}} - {{profile.identifier}} - {{environment.name}}'
-    @email_template.save!
-    get :show_parsed, id: @email_template, :profile => profile.identifier
-    assert_response :success
-    json_response = ActiveSupport::JSON.decode(@response.body)
-    assert_equal "#{profile.name} - #{profile.identifier}", json_response['parsed_subject']
-    assert_equal "#{profile.name} - #{profile.identifier} - #{environment.name}", json_response['parsed_body']
-  end
-
-end
@@ -0,0 +1,65 @@
+require 'test_helper'
+
+class EnvironmentEmailTemplatesControllerTest < ActionController::TestCase
+
+  setup do
+    @email_template = EmailTemplate.create!(:name => 'template', :owner => Environment.default)
+    person = create_user_with_permission('template_manager', 'manage_email_templates', Environment.default)
+    login_as(person.user.login)
+  end
+
+  test "should get index" do
+    get :index
+    assert_response :success
+    assert_not_nil assigns(:email_templates)
+  end
+
+  test "should get new" do
+    get :new
+    assert_response :success
+  end
+
+  test "should create email_template" do
+    assert_difference('EmailTemplate.count') do
+      post :create, email_template: { :name => 'test' }
+    end
+
+    assert_redirected_to url_for(:action => :index)
+  end
+
+  test "should show email_template" do
+    get :show, id: @email_template
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @email_template
+    assert_response :success
+  end
+
+  test "should update email_template" do
+    put :update, id: @email_template, email_template: {  }
+    assert_redirected_to url_for(:action => :index)
+  end
+
+  test "should destroy email_template" do
+    assert_difference('EmailTemplate.count', -1) do
+      delete :destroy, id: @email_template
+    end
+
+    assert_redirected_to url_for(:action => :index)
+  end
+
+  test "should get parsed template" do
+    environment = Environment.default
+    @email_template.subject = '{{environment.name}}'
+    @email_template.body = '{{environment.name}}'
+    @email_template.save!
+    get :show_parsed, id: @email_template
+    assert_response :success
+    json_response = ActiveSupport::JSON.decode(@response.body)
+    assert_equal "#{environment.name}", json_response['parsed_subject']
+    assert_equal "#{environment.name}", json_response['parsed_body']
+  end
+
+end
@@ -629,7 +629,7 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
   should 'display email template link for organizations in control panel' do
     profile = fast_create(Organization)
     get :index, :profile => profile.identifier
-    assert_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}/email_templates" }
+    assert_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}/profile_email_templates" }
   end
  
   should 'not display email template link in control panel for person' do
@@ -0,0 +1,68 @@
+require 'test_helper'
+
+class ProfileEmailTemplatesControllerTest < ActionController::TestCase
+
+  setup do
+    @profile = fast_create(Community)
+    @email_template = EmailTemplate.create!(:name => 'template', :owner => @profile)
+    @person = create_user_with_permission('templatemanager', 'manage_email_templates', @profile)
+    login_as(@person.user.login)
+  end
+
+  attr_accessor :profile, :person
+
+  test "should get index" do
+    get :index, :profile => profile.identifier
+    assert_response :success
+    assert_not_nil assigns(:email_templates)
+  end
+
+  test "should get new" do
+    get :new, :profile => profile.identifier
+    assert_response :success
+  end
+
+  test "should create email_template" do
+    assert_difference('EmailTemplate.count') do
+      post :create, email_template: { :name => 'test' }, :profile => profile.identifier
+    end
+
+    assert_redirected_to url_for(:action => :index)
+  end
+
+  test "should show email_template" do
+    get :show, id: @email_template, :profile => profile.identifier
+    assert_response :success
+  end
+
+  test "should get edit" do
+    get :edit, id: @email_template, :profile => profile.identifier
+    assert_response :success
+  end
+
+  test "should update email_template" do
+    put :update, id: @email_template, email_template: {  }, :profile => profile.identifier
+    assert_redirected_to url_for(:action => :index)
+  end
+
+  test "should destroy email_template" do
+    assert_difference('EmailTemplate.count', -1) do
+      delete :destroy, id: @email_template, :profile => profile.identifier
+    end
+
+    assert_redirected_to url_for(:action => :index)
+  end
+
+  test "should get parsed template" do
+    environment = Environment.default
+    @email_template.subject = '{{profile.name}} - {{profile.identifier}}'
+    @email_template.body = '{{profile.name}} - {{profile.identifier}} - {{environment.name}}'
+    @email_template.save!
+    get :show_parsed, id: @email_template, :profile => profile.identifier
+    assert_response :success
+    json_response = ActiveSupport::JSON.decode(@response.body)
+    assert_equal "#{profile.name} - #{profile.identifier}", json_response['parsed_subject']
+    assert_equal "#{profile.name} - #{profile.identifier} - #{environment.name}", json_response['parsed_body']
+  end
+
+end
@@ -71,4 +71,10 @@ class ChangePasswordTest &lt; ActiveSupport::TestCase
     assert_match(/#{task.requestor.name} wants to change its password/, email.subject)
   end
  
+  should 'set email template when it exists' do
+    template = EmailTemplate.create!(:template_type => :user_change_password, :name => 'template1', :owner => Environment.default)
+    task = ChangePassword.create!(:requestor => person)
+    assert_equal template.id, task.email_template_id
+  end
+
 end
@@ -0,0 +1,20 @@
+require_relative "../test_helper"
+
+class EmailTemplateHelperTest < ActionView::TestCase
+
+  should 'replace body and subject with parsed values from template' do
+    template = mock
+    template.expects(:parsed_body).returns('parsed body')
+    template.expects(:parsed_subject).returns('parsed subject')
+    params = {:subject => 'subject', :body => 'body', :email_template => template}
+    expects(:mail).with({:subject => 'parsed subject', :body => 'parsed body', :content_type => 'text/html'})
+    mail_with_template(params)
+  end
+
+  should 'do not change params if there is no email template' do
+    params = {:subject => 'subject', :body => 'body'}
+    expects(:mail).with(params)
+    mail_with_template(params)
+  end
+
+end
@@ -19,4 +19,35 @@ class EmailTemplateTest &lt; ActiveSupport::TestCase
     assert_equal 'Hi John', template.parsed_subject({:person => 'John'})
   end
  
+  should 'not create template with the same name of other' do
+    template1 = EmailTemplate.new(:template_type => :type1, :name => 'template', :owner => Environment.default)
+    template2 = EmailTemplate.new(:template_type => :type1, :name => 'template', :owner => Environment.default)
+    assert template1.save
+    assert !template2.save
+  end
+
+  should 'not create duplicated template when template type is unique' do
+    template1 = EmailTemplate.new(:template_type => :user_activation, :name => 'template1', :owner => Environment.default)
+    template2 = EmailTemplate.new(:template_type => :user_activation, :name => 'template2', :owner => Environment.default)
+    assert template1.save
+    assert !template2.save
+  end
+
+  should 'create duplicated template when template type is not unique' do
+    template1 = EmailTemplate.new(:template_type => :task_rejection, :name => 'template1', :owner => Environment.default)
+    template2 = EmailTemplate.new(:template_type => :task_rejection, :name => 'template2', :owner => Environment.default)
+    assert template1.save
+    assert template2.save
+  end
+
+  should 'return available types when the owner is an environment' do
+    template = EmailTemplate.new(:owner => Environment.default)
+    assert_equal [:user_activation, :user_change_password], template.available_types.symbolize_keys.keys
+  end
+
+  should 'return available types when the owner is a profile' do
+    template = EmailTemplate.new(:owner => Profile.new)
+    assert_equal [:task_rejection, :task_acceptance, :organization_members], template.available_types.symbolize_keys.keys
+  end
+
 end
@@ -26,6 +26,24 @@ fast_create(Person))
     assert_match /profile\/some-user\/friends\/suggest/, email.body.to_s
   end
  
+  should 'deliver activation code email' do
+    assert_difference 'ActionMailer::Base.deliveries.size' do
+      u = create_user('some-user')
+      UserMailer.activation_code(u).deliver
+    end
+  end
+
+  should 'deliver activation code email with template' do
+    EmailTemplate.create!(:template_type => :user_activation, :name => 'template1', :subject => 'activation template subject', :body => 'activation template body', :owner => Environment.default)
+    assert_difference 'ActionMailer::Base.deliveries.size' do
+      u = create_user('some-user')
+      UserMailer.activation_code(u).deliver
+    end
+    mail = ActionMailer::Base.deliveries.last
+    assert_equal 'activation template subject', mail.subject.to_s
+    assert_equal 'activation template body', mail.body.to_s
+  end
+
   private
  
     def read_fixture(action)
...	...	@@ -0,0 +1,15 @@
	1	+class EnvironmentEmailTemplatesController < EmailTemplatesController
	2	+
	3	+ protect 'manage_email_templates', :environment
	4	+
	5	+ protected
	6	+
	7	+ def owner
	8	+ environment
	9	+ end
	10	+
	11	+ before_filter :only => :index do
	12	+ @back_to = url_for(:controller => :admin_panel)
	13	+ end
	14	+
	15	+end
...	...
...	...	@@ -0,0 +1,62 @@
	1	+class EmailTemplatesController < ApplicationController
	2	+
	3	+ def index
	4	+ @email_templates = owner.email_templates
	5	+ end
	6	+
	7	+ def show
	8	+ @email_template = owner.email_templates.find(params[:id])
	9	+
	10	+ respond_to do \|format\|
	11	+ format.html # show.html.erb
	12	+ format.json { render json: @email_template }
	13	+ end
	14	+ end
	15	+
	16	+ def show_parsed
	17	+ @email_template = owner.email_templates.find(params[:id])
	18	+ template_params = {:profile => owner, :environment => environment}
	19	+ render json: {:parsed_body => @email_template.parsed_body(template_params), :parsed_subject => @email_template.parsed_subject(template_params)}
	20	+ end
	21	+
	22	+ def new
	23	+ @email_template = owner.email_templates.build(:owner => owner)
	24	+ end
	25	+
	26	+ def edit
	27	+ @email_template = owner.email_templates.find(params[:id])
	28	+ end
	29	+
	30	+ def create
	31	+ @email_template = owner.email_templates.build(params[:email_template])
	32	+ @email_template.owner = owner
	33	+
	34	+ if @email_template.save
	35	+ session[:notice] = _('Email template was successfully created.')
	36	+ redirect_to url_for(:action => :index)
	37	+ else
	38	+ render action: "new"
	39	+ end
	40	+ end
	41	+
	42	+ def update
	43	+ @email_template = owner.email_templates.find(params[:id])
	44	+
	45	+ if @email_template.update_attributes(params[:email_template])
	46	+ session[:notice] = _('Email template was successfully updated.')
	47	+ redirect_to url_for(:action => :index)
	48	+ else
	49	+ render action: "edit"
	50	+ end
	51	+ end
	52	+
	53	+ def destroy
	54	+ @email_template = owner.email_templates.find(params[:id])
	55	+ @email_template.destroy
	56	+
	57	+ respond_to do \|format\|
	58	+ format.html { redirect_to url_for(:action => :index)}
	59	+ format.json { head :no_content }
	60	+ end
	61	+ end
	62	+end
...	...
...	...	@@ -1,63 +0,0 @@
1		-class EmailTemplatesController < MyProfileController
2		-
3		- protect 'manage_email_templates', :profile
4		-
5		- def index
6		- @email_templates = profile.email_templates
7		- end
8		-
9		- def show
10		- @email_template = profile.email_templates.find(params[:id])
11		-
12		- respond_to do \|format\|
13		- format.html # show.html.erb
14		- format.json { render json: @email_template }
15		- end
16		- end
17		-
18		- def show_parsed
19		- @email_template = profile.email_templates.find(params[:id])
20		- template_params = {:profile => profile, :environment => environment}
21		- render json: {:parsed_body => @email_template.parsed_body(template_params), :parsed_subject => @email_template.parsed_subject(template_params)}
22		- end
23		-
24		- def new
25		- @email_template = profile.email_templates.build
26		- end
27		-
28		- def edit
29		- @email_template = profile.email_templates.find(params[:id])
30		- end
31		-
32		- def create
33		- @email_template = profile.email_templates.build(params[:email_template], :owner => profile)
34		-
35		- if @email_template.save
36		- session[:notice] = _('Email template was successfully created.')
37		- redirect_to url_for(:action => :index)
38		- else
39		- render action: "new"
40		- end
41		- end
42		-
43		- def update
44		- @email_template = profile.email_templates.find(params[:id])
45		-
46		- if @email_template.update_attributes(params[:email_template])
47		- session[:notice] = _('Email template was successfully updated.')
48		- redirect_to url_for(:action => :index)
49		- else
50		- render action: "edit"
51		- end
52		- end
53		-
54		- def destroy
55		- @email_template = profile.email_templates.find(params[:id])
56		- @email_template.destroy
57		-
58		- respond_to do \|format\|
59		- format.html { redirect_to url_for(:action => :index)}
60		- format.json { head :no_content }
61		- end
62		- end
63		-end
...	...	@@ -0,0 +1,16 @@
	1	+class ProfileEmailTemplatesController < EmailTemplatesController
	2	+
	3	+ needs_profile
	4	+ protect 'manage_email_templates', :profile
	5	+
	6	+ protected
	7	+
	8	+ def owner
	9	+ profile
	10	+ end
	11	+
	12	+ before_filter :only => :index do
	13	+ @back_to = url_for(:controller => :profile_editor)
	14	+ end
	15	+
	16	+end
...	...
...	...	@@ -0,0 +1,12 @@
	1	+module EmailTemplateHelper
	2	+
	3	+ def mail_with_template(params={})
	4	+ if params[:email_template].present?
	5	+ params[:body] = params[:email_template].parsed_body(params[:template_params])
	6	+ params[:subject] = params[:email_template].parsed_subject(params[:template_params])
	7	+ params[:content_type] = "text/html"
	8	+ end
	9	+ mail(params.except(:email_template))
	10	+ end
	11	+
	12	+end
...	...
...	...	@@ -5,7 +5,7 @@ module TaskHelper
5	5
6	6	content_tag(
7	7	:div,
8		- labelled_form_field(description, select_tag("tasks[#{task.id}][task][email_template_id]", options_from_collection_for_select(email_templates, :id, :name), :include_blank => include_blank, 'data-url' => url_for(:controller => 'email_templates', :action => 'show_parsed', :profile => profile.identifier))),
	8	+ labelled_form_field(description, select_tag("tasks[#{task.id}][task][email_template_id]", options_from_collection_for_select(email_templates, :id, :name), :include_blank => include_blank, 'data-url' => url_for(:controller => 'profile_email_templates', :action => 'show_parsed', :profile => profile.identifier))),
9	9	:class => 'template-selection'
10	10	)
11	11	end
...	...
1	1	class TaskMailer < ActionMailer::Base
2	2
	3	+ include EmailTemplateHelper
	4	+
3	5	def target_notification(task, message)
4	6	@message = extract_message(message)
5	7	@target = task.target.name
...	...	@@ -33,15 +35,13 @@ class TaskMailer < ActionMailer::Base
33	35	@requestor = task.requestor.name
34	36	@environment = task.requestor.environment.name
35	37	@url = url_for(:host => task.requestor.environment.default_hostname, :controller => 'home')
36		- @email_template = task.email_template
37		- template_params = {:environment => task.requestor.environment, :task => task}
38	38
39		- mail(
	39	+ mail_with_template(
40	40	to: task.requestor.notification_emails,
41	41	from: self.class.generate_from(task),
42		- subject: @email_template.present? ? @email_template.parsed_subject(template_params) : '[%s] %s' % [task.requestor.environment.name, task.target_notification_description],
43		- body: @email_template.present? ? @email_template.parsed_body(template_params) : nil,
44		- content_type: @email_template.present? ? "text/html" : nil
	42	+ subject: '[%s] %s' % [task.requestor.environment.name, task.target_notification_description],
	43	+ email_template: task.email_template,
	44	+ template_params: {:environment => task.requestor.environment, :task => task, :message => @message, :url => @url, :requestor => task.requestor}
45	45	)
46	46	end
47	47
...	...
1	1	class UserMailer < ActionMailer::Base
	2	+
	3	+ include EmailTemplateHelper
	4	+
2	5	def activation_email_notify(user)
3	6	user_email = "#{user.login}@#{user.email_domain}"
4	7	@name = user.name
...	...	@@ -22,10 +25,12 @@ class UserMailer < ActionMailer::Base
22	25	@redirection = (true if user.return_to)
23	26	@join = (user.community_to_join if user.community_to_join)
24	27
25		- mail(
	28	+ mail_with_template(
26	29	from: "#{user.environment.name} <#{user.environment.contact_email}>",
27	30	to: user.email,
28	31	subject: _("[%s] Activate your account") % [user.environment.name],
	32	+ template_params: {:environment => user.environment, :activation_code => @activation_code, :redirection => @redirection, :join => @join},
	33	+ email_template: user.environment.email_templates.find_by_template_type(:user_activation),
29	34	)
30	35	end
31	36
...	...
...	...	@@ -28,6 +28,13 @@ class ChangePassword < Task
28	28	validates_presence_of :password_confirmation, :on => :update, :if => lambda { \|change\| change.status != Task::Status::CANCELLED }
29	29	validates_confirmation_of :password, :if => lambda { \|change\| change.status != Task::Status::CANCELLED }
30	30
	31	+ before_save :set_email_template
	32	+
	33	+ def set_email_template
	34	+ template = environment.email_templates.find_by_template_type(:user_change_password)
	35	+ data[:email_template_id] = template.id unless template.nil?
	36	+ end
	37	+
31	38	def environment
32	39	requestor.environment unless requestor.nil?
33	40	end
...	...
...	...	@@ -6,6 +6,10 @@ class EmailTemplate < ActiveRecord::Base
6	6
7	7	validates_presence_of :name
8	8
	9	+ validates :name, uniqueness: { scope: [:owner_type, :owner_id] }
	10	+
	11	+ validates :template_type, uniqueness: { scope: [:owner_type, :owner_id] }, if: :unique_by_type?
	12	+
9	13	def parsed_body(params)
10	14	@parsed_body \|\|= parse(body, params)
11	15	end
...	...	@@ -14,12 +18,26 @@ class EmailTemplate < ActiveRecord::Base
14	18	@parsed_subject \|\|= parse(subject, params)
15	19	end
16	20
	21	+ def self.available_types
	22	+ {
	23	+ :task_rejection => {:description => _('Task Rejection'), :owner_type => Profile},
	24	+ :task_acceptance => {:description => _('Task Acceptance'), :owner_type => Profile},
	25	+ :organization_members => {:description => _('Organization Members'), :owner_type => Profile},
	26	+ :user_activation => {:description => _('User Activation'), :unique => true, :owner_type => Environment},
	27	+ :user_change_password => {:description => _('Change User Password'), :unique => true, :owner_type => Environment}
	28	+ }
	29	+ end
	30	+
17	31	def available_types
18		- HashWithIndifferentAccess.new ({
19		- :task_rejection => {:description => _('Task Rejection')},
20		- :task_acceptance => {:description => _('Task Acceptance')},
21		- :organization_members => {:description => _('Organization Members')}
22		- })
	32	+ HashWithIndifferentAccess.new EmailTemplate.available_types.select {\|k, v\| owner.kind_of?(v[:owner_type])}
	33	+ end
	34	+
	35	+ def type_description
	36	+ available_types.fetch(template_type, {})[:description]
	37	+ end
	38	+
	39	+ def unique_by_type?
	40	+ available_types.fetch(template_type, {})[:unique]
23	41	end
24	42
25	43	protected
...	...