Merge branch 'email_template' into 'master'

New feature: manage email templates This MR depends on liquid ~> 3.0.3 and this version is not available on Debian Jessie, just in testing and unstable. So, I will upload ruby-liquid (3.0.4) to Noosfero Debian Jessie archive to satisfy it. See merge request !814

Merge branch 'email_template' into 'master'
New feature: manage email templates This MR depends on liquid ~> 3.0.3 and this version is not available on Debian Jessie, just in testing and unstable. So, I will upload ruby-liquid (3.0.4) to Noosfero Debian Jessie archive to satisfy it. See merge request !814
Rodrigo Souto
2 parents b113016a b62506a9
Showing 48 changed files with 753 additions and 7 deletions Show diff stats
Gemfile
app/controllers/admin/environment_email_templates_controller.rb
app/controllers/my_profile/email_templates_controller.rb
app/controllers/my_profile/profile_email_templates_controller.rb
app/controllers/my_profile/tasks_controller.rb
app/controllers/public/profile_controller.rb
app/helpers/application_helper.rb
app/helpers/email_template_helper.rb
app/helpers/task_helper.rb
app/mailers/task_mailer.rb
app/mailers/user_mailer.rb
app/models/article.rb
app/models/change_password.rb
app/models/email_template.rb
app/models/environment.rb
app/models/profile.rb
app/models/task.rb
app/views/admin_panel/index.html.erb
app/views/email_templates/_form.html.erb
app/views/email_templates/edit.html.erb
@@ -39,6 +39,7 @@ gem &#39;grape_logging&#39;
 gem 'rack-cors'
 gem 'rack-contrib'
 gem 'api-pagination',           '>= 4.1.1'
+gem 'liquid',                    '~> 3.0.3'
  
 # asset pipeline
 gem 'uglifier', '>= 1.0.3'
@@ -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,76 @@
+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])
+    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)
+    @template_params_allowed = template_params_allowed template_params.keys
+  end
+
+  def edit
+    @email_template = owner.email_templates.find(params[:id])
+    @template_params_allowed = template_params_allowed template_params.keys
+  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
+
+  private
+
+  def template_params
+    {:profile_name => current_user.name, :environment_name => environment.name }
+  end
+
+  def template_params_allowed params
+      result = ""
+      params.each{ |param| result <<  "{{ #{param} }} " } if params
+      result
+  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
@@ -7,6 +7,9 @@ class TasksController &lt; MyProfileController
   helper CustomFieldsHelper
  
   def index
+    @rejection_email_templates = profile.email_templates.find_all_by_template_type(:task_rejection)
+    @acceptance_email_templates = profile.email_templates.find_all_by_template_type(:task_acceptance)
+
     @filter_type = params[:filter_type].presence
     @filter_text = params[:filter_text].presence
     @filter_responsible = params[:filter_responsible]
@@ -371,6 +371,7 @@ class ProfileController &lt; PublicController
   def send_mail
     @mailing = profile.mailings.build(params[:mailing])
     @mailing.data = session[:members_filtered] ? {:members_filtered => session[:members_filtered]} : {}
+    @email_templates = profile.email_templates.find_all_by_template_type(:organization_members)
     if request.post?
       @mailing.locale = locale
       @mailing.person = user
@@ -54,6 +54,8 @@ module ApplicationHelper
  
   include ThemeLoaderHelper
  
+  include TaskHelper
+
   def locale
     (@page && !@page.language.blank?) ? @page.language : FastGettext.locale
   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
@@ -0,0 +1,13 @@
+module TaskHelper
+
+  def task_email_template(description, email_templates, task, include_blank=true)
+    return '' unless email_templates.present?
+
+    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 => 'profile_email_templates', :action => 'show_parsed', :profile => profile.identifier))),
+      :class => 'template-selection'
+    )
+  end
+
+end
 class TaskMailer < ApplicationMailer
  
+  include EmailTemplateHelper
+
   def target_notification(task, message)
     self.environment = task.environment
  
@@ -38,10 +40,12 @@ class TaskMailer &lt; ApplicationMailer
     @requestor = task.requestor.name
     @url = url_for(:host => task.requestor.environment.default_hostname, :controller => 'home')
  
-    mail(
+    mail_with_template(
       to: task.requestor.notification_emails,
       from: self.class.generate_from(task),
-      subject: '[%s] %s' % [task.requestor.environment.name, task.target_notification_description]
+      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 < ApplicationMailer
  
+  include EmailTemplateHelper
+
   def activation_email_notify(user)
     self.environment = user.environment
  
@@ -25,10 +27,12 @@ class UserMailer &lt; ApplicationMailer
     @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, :person => user.person, :url => @url},
+      email_template: user.environment.email_templates.find_by_template_type(:user_activation),
     )
   end
  
@@ -840,6 +840,10 @@ class Article &lt; ActiveRecord::Base
     true
   end
  
+  def to_liquid
+    HashWithIndifferentAccess.new :name => name, :abstract => abstract, :body => body, :id => id, :parent_id => parent_id, :author => author
+  end
+
   private
  
   def sanitize_tag_list
@@ -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
@@ -0,0 +1,50 @@
+class EmailTemplate < ActiveRecord::Base
+
+  belongs_to :owner, :polymorphic => true
+
+  attr_accessible :template_type, :subject, :body, :owner, :name
+
+  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
+
+  def parsed_subject(params)
+    @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 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
+
+  def parse(source, params)
+    template = Liquid::Template.parse(source)
+    template.render(HashWithIndifferentAccess.new(params))
+  end
+
+end
@@ -25,6 +25,7 @@ class Environment &lt; ActiveRecord::Base
   has_many :tasks, :dependent => :destroy, :as => 'target'
   has_many :search_terms, :as => :context
   has_many :custom_fields, :dependent => :destroy
+  has_many :email_templates, :foreign_key => :owner_id
  
   IDENTIFY_SCRIPTS = /(php[0-9s]?|[sp]htm[l]?|pl|py|cgi|rb)/
  
@@ -55,6 +56,7 @@ class Environment &lt; ActiveRecord::Base
     'manage_environment_trusted_sites' => N_('Manage environment trusted sites'),
     'edit_appearance'      => N_('Edit appearance'),
     'edit_raw_html_block'      => N_('Edit Raw HTML block'),
+    'manage_email_templates' => N_('Manage Email Templates'),
   }
  
   module Roles
@@ -1010,6 +1012,10 @@ class Environment &lt; ActiveRecord::Base
     self.licenses.any?
   end
  
+  def to_liquid
+    HashWithIndifferentAccess.new :name => name
+  end
+
   private
  
   def default_language_available
@@ -84,6 +84,7 @@ class Profile &lt; 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
@@ -218,6 +219,8 @@ class Profile &lt; ActiveRecord::Base
  
   has_many :comments_received, :class_name => 'Comment', :through => :articles, :source => :comments
  
+  has_many :email_templates, :foreign_key => :owner_id
+
   # Although this should be a has_one relation, there are no non-silly names for
   # a foreign key on article to reference the template to which it is
   # welcome_page... =P
@@ -542,6 +545,10 @@ class Profile &lt; ActiveRecord::Base
     ).order('articles.published_at desc, articles.id desc')
   end
  
+  def to_liquid
+    HashWithIndifferentAccess.new :name => name, :identifier => identifier
+  end
+
   class << self
  
     # finds a profile by its identifier. This method is a shortcut to
@@ -41,6 +41,8 @@ class Task &lt; ActiveRecord::Base
  
   attr_protected :status
  
+  settings_items :email_template_id, :type => :integer
+
   def initialize(*args)
     super
     self.status = (args.first ? args.first[:status] : nil) || Task::Status::ACTIVE
@@ -273,6 +275,18 @@ class Task &lt; ActiveRecord::Base
     end
   end
  
+  def email_template
+    @email_template ||= email_template_id.present? ? EmailTemplate.find_by_id(email_template_id) : nil
+  end
+
+  def to_liquid
+    HashWithIndifferentAccess.new({
+      :requestor => requestor,
+      :reject_explanation => reject_explanation,
+      :code => code
+    })
+  end
+
   scope :pending, -> { where status: Task::Status::ACTIVE }
   scope :hidden, -> { where status: Task::Status::HIDDEN }
   scope :finished, -> { where status: Task::Status::FINISHED }
@@ -11,6 +11,7 @@
   <tr><td><%= link_to _('Homepage'), :action => 'set_portal_community' %></td></tr>
   <tr><td><%= link_to _('Licenses'), :controller =>'licenses' %></td></tr>
   <tr><td><%= link_to _('Trusted sites'), :controller =>'trusted_sites' %></td></tr>
+  <tr><td><%= link_to _('Email templates'), :controller =>'environment_email_templates' %></td></tr>
 </table>
  
 <h2><%= _('Profiles') %></h2>
@@ -0,0 +1,31 @@
+<%= 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? %>
+
+  <div class="template-fields">
+    <div class="header-fields">
+      <%= labelled_form_field(_('Template Name:'), f.text_field(:name)) %>
+      <%= labelled_form_field(_('Template Type:'), f.select(:template_type, @email_template.available_types.map {|k,v| [v[:description], k]}, :include_blank => true)) %>
+      <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
+    </div>
+    <div class="available-params">
+      <div class="reference">
+        <a target="_blank" href="https://github.com/Shopify/liquid/wiki/Liquid-for-Designers"><%= _('Template language reference') %></a>
+      </div>
+      <div class="label">
+        <%= _('The following parameters may be used in subject and body:') %>
+      </div>
+      <div class="values">
+        <%= @template_params_allowed %>
+      </div>
+    </div>
+    <%= render :file => 'shared/tiny_mce' %>
+    <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
+  </div>
+
+  <div class="actions">
+    <%= submit_button(:save, _('Save')) %>
+    <%= button(:back, _('Back'), :action => :index) %>
+  </div>
+
+<% end %>
@@ -0,0 +1,3 @@
+<h1>Editing Email Template</h1>
+
+<%= render 'form' %>
@@ -0,0 +1,27 @@
+<div class="email-templates">
+  <h1><%= _('Email Templates') %></h1>
+
+  <table>
+    <tr>
+      <th><%= _('Name') %></th>
+      <th><%= _('Type') %></th>
+      <th><%= _('Actions') %></th>
+    </tr>
+
+  <% @email_templates.each do |email_template| %>
+    <tr>
+      <td><%= email_template.name %></td>
+      <td><%= email_template.type_description %></td>
+      <td>
+        <%= 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 %>
+  </table>
+
+  <br />
+
+  <%= button(:new, _('New template'), :action => :new) %>
+  <%= button(:back, _('Back'), @back_to) %>
+</div>
@@ -0,0 +1,3 @@
+<h1>New Email Template</h1>
+
+<%= render 'form' %>
@@ -0,0 +1,5 @@
+<p id="notice"><%= notice %></p>
+
+
+<%= link_to 'Edit', url_for(:action => :edit, :id => @email_template.id) %> |
+<%= link_to 'Back', url_for(:action => :index) %>
@@ -6,6 +6,11 @@
  
   <% to = @mailing.data[:members_filtered].present? ? @mailing.recipients.map{|r| r.name}.join(', ') : _('All members')%>
   <%= labelled_form_field(_('To:'), text_area(:data, 'members_filtered', :value => to, :rows => 4, :disabled => 'disabled', :class => 'send-mail-recipients'))  %>
+<div class="template-selection">
+  <% if @email_templates.present? %>
+    <%= 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'))) %>
+  </div>
+<% end %>
  
 <%= form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do |f| %>
  
@@ -72,6 +72,8 @@
  
   <%= control_panel_button(_('Edit welcome page'), 'welcome-page', :action => 'welcome_page') if has_welcome_page %>
  
+  <%= 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]) %>
   <% end %>
+<%= task_email_template(_('Select an acceptance email template:'), @acceptance_email_templates, task) %>
+
 <%= render :file => 'shared/tiny_mce' %>
  
 <%= labelled_form_field(_('Create a link'), f.check_box(:create_link)) %>
+<%= task_email_template(_('Select a rejection email template:'), @rejection_email_templates, task) %>
+
 <%= labelled_form_field(_('Rejection explanation'), f.text_area(:reject_explanation, :rows => 5)) %>
@@ -0,0 +1,12 @@
+class CreateEmailTemplate < ActiveRecord::Migration
+  def change
+    create_table :email_templates do |t|
+      t.string :name
+      t.string :template_type
+      t.string :subject
+      t.text :body
+      t.references :owner, :polymorphic => true
+      t.timestamps
+    end
+  end
+end
@@ -357,6 +357,17 @@ ActiveRecord::Schema.define(version: 20160324132518) do
   add_index "domains", ["owner_id", "owner_type", "is_default"], name: "index_domains_on_owner_id_and_owner_type_and_is_default", using: :btree
   add_index "domains", ["owner_id", "owner_type"], name: "index_domains_on_owner_id_and_owner_type", using: :btree
  
+  create_table "email_templates", force: :cascade do |t|
+    t.string   "name"
+    t.string   "template_type"
+    t.string   "subject"
+    t.text     "body"
+    t.integer  "owner_id"
+    t.string   "owner_type"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "environments", force: :cascade do |t|
     t.string   "name"
     t.string   "contact_email"
@@ -15,6 +15,7 @@ Build-Depends: cucumber,
                ruby-diffy,
                ruby-gettext,
                ruby-launchy-shim,
+               ruby-liquid (>= 3.0.3),
                ruby-minitest,
                ruby-minitest-reporters,
                ruby-mocha,
@@ -33,6 +33,7 @@
 *= require require_login.js
 *= require slick.js
 *= require block-store.js
+*= require email_templates.js
 */
  
 // lodash configuration
@@ -0,0 +1,10 @@
+jQuery(document).ready(function($) {
+  $('.template-selection select').change(function() {
+    if(!$(this).val()) return;
+
+    $.getJSON($(this).data('url'), {id: $(this).val()}, function(data) {
+      $('#mailing-form #mailing_subject').val(data.parsed_subject);
+      $('#mailing-form .mceEditor').val(data.parsed_body);
+    });
+  });
+});
@@ -2,18 +2,28 @@
  
   $("input.task_accept_radio").click(function(){
     task_id = this.getAttribute("task_id");
-    $('#on-accept-information-' + task_id).show('fast');
-    $('#on-reject-information-' + task_id).hide('fast');
+    var accept_container = $('#on-accept-information-' + task_id);
+    var reject_container = $('#on-reject-information-' + task_id);
+
+    accept_container.show('fast');
+    reject_container.hide('fast');
     $('#on-skip-information-'   + task_id).hide('fast');
     $('#custom-field-information-' + task_id).show('fast');
+    reject_container.find('input, select').prop('disabled', true);
+    accept_container.find('input, select').prop('disabled', false);
   })
  
   $("input.task_reject_radio").click(function(){
     task_id = this.getAttribute("task_id");
-    $('#on-accept-information-' + task_id).hide('fast');
-    $('#on-reject-information-' + task_id).show('fast');
+    var accept_container = $('#on-accept-information-' + task_id);
+    var reject_container = $('#on-reject-information-' + task_id);
+
+    accept_container.hide('fast');
+    reject_container.show('fast');
     $('#on-skip-information-'   + task_id).hide('fast');
     $('#custom-field-information-' + task_id).show('fast');
+    reject_container.find('input, select').prop('disabled', false);
+    accept_container.find('input, select').prop('disabled', true);
   })
  
   $("input.task_skip_radio").click(function(){
@@ -0,0 +1 @@
+Subproject commit e7ad7849b3ef685639d4c5c0bef7b323255e2afa
@@ -0,0 +1,18 @@
+.template-fields .header-fields, .template-fields .available-params {
+  width: 48%;
+  display: inline-block;
+}
+.template-fields .available-params .values {
+  color: rgb(111, 111, 111);
+}
+.template-fields .available-params .reference {
+  text-align: right;
+}
+.template-fields .available-params .reference a {
+  color: rgb(32, 101, 229);
+  text-decoration: none;
+  font-size: 10px;
+}
+.email-templates table td {
+  text-align: center;
+}
@@ -168,6 +168,9 @@
 .controller-profile_editor .msie6 a.control-panel-roles {
   background-image: url(../images/control-panel/role-management.gif)
 }
+.controller-profile_editor .control-panel .control-panel-email-templates {
+  background-image: url(../images/control-panel/email.png)
+}
  
 .controller-profile_editor #profile-data {
   display: table;
@@ -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
@@ -101,3 +103,4 @@ environment_administrator:
    - manage_environment_templates
    - manage_environment_licenses
    - edit_raw_html_block
+   - manage_email_templates
@@ -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
@@ -1527,6 +1527,29 @@ class ProfileControllerTest &lt; ActionController::TestCase
     assert_redirected_to :action => 'members'
   end
  
+  should 'display email templates as an option to send mail' do
+    community = fast_create(Community)
+    create_user_with_permission('profile_moderator_user', 'send_mail_to_members', community)
+    login_as('profile_moderator_user')
+
+    template1 = EmailTemplate.create!(:owner => community, :name => "Template 1", :template_type => :organization_members)
+    template2 = EmailTemplate.create!(:owner => community, :name => "Template 2")
+
+    get :send_mail, :profile => community.identifier, :mailing => {:subject => 'Hello', :body => 'We have some news'}
+    assert_select '.template-selection'
+    assert_equal [template1], assigns(:email_templates)
+  end
+
+  should 'do not display email template selection when there is no template for organization members' do
+    community = fast_create(Community)
+    create_user_with_permission('profile_moderator_user', 'send_mail_to_members', community)
+    login_as('profile_moderator_user')
+
+    get :send_mail, :profile => community.identifier, :mailing => {:subject => 'Hello', :body => 'We have some news'}
+    assert_select '.template-selection'
+    assert assigns(:email_templates).empty?
+  end
+
   should 'show all fields to anonymous user' do
     viewed = create_user('person_1').person
     Environment.any_instance.stubs(:active_person_fields).returns(['sex', 'birth_date'])
@@ -623,6 +623,17 @@ class ProfileEditorControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'a', :attributes => { :href => '/myprofile/default_user/cms' }
   end
  
+  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}/profile_email_templates" }
+  end
+
+  should 'not display email template link in control panel for person' do
+    get :index, :profile => profile.identifier
+    assert_no_tag :tag => 'a', :attributes => { :href => "/myprofile/#{profile.identifier}/email_templates" }
+  end
+
   should 'offer to create blog in control panel' do
     get :index, :profile => profile.identifier
     assert_tag :tag => 'a', :attributes => { :href => "/myprofile/default_user/cms/new?type=Blog" }
@@ -0,0 +1,68 @@
+require 'test_helper'
+
+class ProfileEmailTemplatesControllerTest < ActionController::TestCase
+
+  setup do
+    @profile = fast_create(Community)
+    @person = create_user_with_permission('templatemanager', 'manage_email_templates', @profile)
+    @email_template = EmailTemplate.create!(:name => 'template', :owner => @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}} - {{environment_name}}'
+    @email_template.body = '{{profile_name}} - {{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 "#{@person.name} - #{environment.name}", json_response['parsed_subject']
+    assert_equal "#{@person.name} - #{environment.name}", json_response['parsed_body']
+  end
+
+end
@@ -704,4 +704,30 @@ class TasksControllerTest &lt; ActionController::TestCase
     assert_tag :tag=> 'div', :attributes => { :class => 'field-name' }, :content => /great_field: new value for community!/
   end
  
+  should "display email template selection when accept a task" do
+    community = fast_create(Community)
+    @controller.stubs(:profile).returns(community)
+    person = create_user_with_permission('taskviewer', 'view_tasks', community)
+    login_as person.user.login
+
+    email_template = EmailTemplate.create!(:name => 'template', :owner => community, :template_type => :task_acceptance)
+    task = ApproveArticle.create!(:requestor => person, :target => community, :responsible => person)
+    get :index
+    assert_select "#on-accept-information-#{task.id} .template-selection"
+    assert_equal [email_template], assigns(:acceptance_email_templates)
+  end
+
+  should "display email template selection when reject a task" do
+    community = fast_create(Community)
+    @controller.stubs(:profile).returns(community)
+    person = create_user_with_permission('taskviewer', 'view_tasks', community)
+    login_as person.user.login
+
+    email_template = EmailTemplate.create!(:name => 'template', :owner => community, :template_type => :task_rejection)
+    task = ApproveArticle.create!(:requestor => person, :target => community, :responsible => person)
+    get :index
+    assert_select "#on-reject-information-#{task.id} .template-selection"
+    assert_equal [email_template], assigns(:rejection_email_templates)
+  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
@@ -0,0 +1,53 @@
+require_relative "../test_helper"
+
+class EmailTemplateTest < ActiveSupport::TestCase
+
+  should 'filter templates by type' do
+    EmailTemplate.create!(:template_type => :type1, :name => 'template1')
+    EmailTemplate.create!(:template_type => :type2, :name => 'template2')
+    EmailTemplate.create!(:template_type => :type2, :name => 'template3')
+    assert_equal ['template2', 'template3'], EmailTemplate.find_all_by_template_type(:type2).map(&:name)
+  end
+
+  should 'parse body using params' do
+    template = EmailTemplate.new(:body => 'Hi {{person}}')
+    assert_equal 'Hi John', template.parsed_body({:person => 'John'})
+  end
+
+  should 'parse subject using params' do
+    template = EmailTemplate.new(:subject => 'Hi {{person}}')
+    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
@@ -0,0 +1,23 @@
+require_relative "../test_helper"
+
+class TaskHelperTest < ActionView::TestCase
+
+  include ApplicationHelper
+
+  def setup
+    @profile = fast_create(Profile)
+    @task = fast_create(Task, :target_id => @profile.id)
+  end
+
+  attr_accessor :task, :profile
+
+  should 'return select field for template selection when there is templates to choose' do
+    email_templates = 3.times.map { EmailTemplate.new }
+    assert_tag_in_string task_email_template('Description', email_templates, task), :tag => 'div', :attributes => {:class => 'template-selection'}
+  end
+
+  should 'not return select field for template selection when there is no templates to choose' do
+    assert task_email_template('Description', [], task).blank?
+  end
+
+end
@@ -123,6 +123,53 @@ class TaskMailerTest &lt; ActiveSupport::TestCase
     assert_match(/#{url_to_compare}/, mail.body.to_s)
   end
  
+  should 'be able to send rejection notification based on a selected template' do
+    task = Task.new
+    task.expects(:task_cancelled_message).returns('the message')
+    task.reject_explanation = 'explanation'
+
+    profile = fast_create(Community)
+    email_template = EmailTemplate.create!(:owner => profile, :name => 'Template 1', :subject => 'template subject - {{environment.name}}', :body => 'template body - {{environment.name}} - {{task.requestor.name}} - {{task.reject_explanation}}')
+    task.email_template_id = email_template.id
+
+    requestor = Profile.new(:name => 'my name')
+    requestor.expects(:notification_emails).returns(['requestor@example.com']).at_least_once
+
+    task.expects(:requestor).returns(requestor).at_least_once
+    requestor.expects(:environment).returns(@environment).at_least_once
+    task.expects(:environment).returns(@environment).at_least_once
+
+    task.send(:send_notification, :cancelled).deliver
+    assert !ActionMailer::Base.deliveries.empty?
+    mail = ActionMailer::Base.deliveries.last
+    assert_match /text\/html/, mail.content_type
+    assert_equal 'template subject - example', mail.subject.to_s
+    assert_equal 'template body - example - my name - explanation', mail.body.to_s
+  end
+
+  should 'be able to send accept notification based on a selected template' do
+    task = Task.new
+    task.expects(:task_finished_message).returns('the message')
+
+    profile = fast_create(Community)
+    email_template = EmailTemplate.create!(:owner => profile, :name => 'Template 1', :subject => 'template subject - {{environment.name}}', :body => 'template body - {{environment.name}} - {{task.requestor.name}}')
+    task.email_template_id = email_template.id
+
+    requestor = Profile.new(:name => 'my name')
+    requestor.expects(:notification_emails).returns(['requestor@example.com']).at_least_once
+
+    task.expects(:requestor).returns(requestor).at_least_once
+    requestor.expects(:environment).returns(@environment).at_least_once
+    task.expects(:environment).returns(@environment).at_least_once
+
+    task.send(:send_notification, :finished).deliver
+    assert !ActionMailer::Base.deliveries.empty?
+    mail = ActionMailer::Base.deliveries.last
+    assert_match /text\/html/, mail.content_type
+    assert_equal 'template subject - example', mail.subject.to_s
+    assert_equal 'template body - example - my name', mail.body.to_s
+  end
+
   private
     def read_fixture(action)
       IO.readlines("#{FIXTURES_PATH}/task_mailer/#{action}")
@@ -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)
...	...	@@ -39,6 +39,7 @@ gem 'grape_logging'
39	39	gem 'rack-cors'
40	40	gem 'rack-contrib'
41	41	gem 'api-pagination', '>= 4.1.1'
	42	+gem 'liquid', '~> 3.0.3'
42	43
43	44	# asset pipeline
44	45	gem 'uglifier', '>= 1.0.3'
...	...
...	...	@@ -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,76 @@
	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	+ render json: {:parsed_body => @email_template.parsed_body(template_params), :parsed_subject => @email_template.parsed_subject(template_params)}
	19	+ end
	20	+
	21	+ def new
	22	+ @email_template = owner.email_templates.build(:owner => owner)
	23	+ @template_params_allowed = template_params_allowed template_params.keys
	24	+ end
	25	+
	26	+ def edit
	27	+ @email_template = owner.email_templates.find(params[:id])
	28	+ @template_params_allowed = template_params_allowed template_params.keys
	29	+ end
	30	+
	31	+ def create
	32	+ @email_template = owner.email_templates.build(params[:email_template])
	33	+ @email_template.owner = owner
	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 = owner.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 = owner.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	+
	64	+ private
	65	+
	66	+ def template_params
	67	+ {:profile_name => current_user.name, :environment_name => environment.name }
	68	+ end
	69	+
	70	+ def template_params_allowed params
	71	+ result = ""
	72	+ params.each{ \|param\| result << "{{ #{param} }} " } if params
	73	+ result
	74	+ end
	75	+
	76	+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
...	...
...	...	@@ -7,6 +7,9 @@ class TasksController < MyProfileController
7	7	helper CustomFieldsHelper
8	8
9	9	def index
	10	+ @rejection_email_templates = profile.email_templates.find_all_by_template_type(:task_rejection)
	11	+ @acceptance_email_templates = profile.email_templates.find_all_by_template_type(:task_acceptance)
	12	+
10	13	@filter_type = params[:filter_type].presence
11	14	@filter_text = params[:filter_text].presence
12	15	@filter_responsible = params[:filter_responsible]
...	...
...	...	@@ -371,6 +371,7 @@ class ProfileController < PublicController
371	371	def send_mail
372	372	@mailing = profile.mailings.build(params[:mailing])
373	373	@mailing.data = session[:members_filtered] ? {:members_filtered => session[:members_filtered]} : {}
	374	+ @email_templates = profile.email_templates.find_all_by_template_type(:organization_members)
374	375	if request.post?
375	376	@mailing.locale = locale
376	377	@mailing.person = user
...	...
...	...	@@ -54,6 +54,8 @@ module ApplicationHelper
54	54
55	55	include ThemeLoaderHelper
56	56
	57	+ include TaskHelper
	58	+
57	59	def locale
58	60	(@page && !@page.language.blank?) ? @page.language : FastGettext.locale
59	61	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
...	...
...	...	@@ -0,0 +1,13 @@
	1	+module TaskHelper
	2	+
	3	+ def task_email_template(description, email_templates, task, include_blank=true)
	4	+ return '' unless email_templates.present?
	5	+
	6	+ content_tag(
	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 => 'profile_email_templates', :action => 'show_parsed', :profile => profile.identifier))),
	9	+ :class => 'template-selection'
	10	+ )
	11	+ end
	12	+
	13	+end
...	...
1	1	class TaskMailer < ApplicationMailer
2	2
	3	+ include EmailTemplateHelper
	4	+
3	5	def target_notification(task, message)
4	6	self.environment = task.environment
5	7
...	...	@@ -38,10 +40,12 @@ class TaskMailer < ApplicationMailer
38	40	@requestor = task.requestor.name
39	41	@url = url_for(:host => task.requestor.environment.default_hostname, :controller => 'home')
40	42
41		- mail(
	43	+ mail_with_template(
42	44	to: task.requestor.notification_emails,
43	45	from: self.class.generate_from(task),
44		- subject: '[%s] %s' % [task.requestor.environment.name, task.target_notification_description]
	46	+ subject: '[%s] %s' % [task.requestor.environment.name, task.target_notification_description],
	47	+ email_template: task.email_template,
	48	+ template_params: {:environment => task.requestor.environment, :task => task, :message => @message, :url => @url, :requestor => task.requestor}
45	49	)
46	50	end
47	51
...	...