Merge branch 'production' of gitlab.com:participa/noosfero into production

Conflicts: app/views/cms/_event.html.erb

Merge branch 'production' of gitlab.com:participa/noosfero into production
Conflicts: app/views/cms/_event.html.erb
Evandro Jr
2 parents 8f14851f cbe76440
Showing 34 changed files with 411 additions and 59 deletions Show diff stats
Gemfile
app/controllers/my_profile/email_templates_controller.rb
app/controllers/my_profile/tasks_controller.rb
app/controllers/public/profile_controller.rb
app/mailers/task_mailer.rb
app/models/email_template.rb
app/models/environment.rb
app/models/event.rb
app/models/profile.rb
app/models/task.rb
app/views/cms/_event.html.erb
app/views/email_templates/_form.html.erb
app/views/email_templates/edit.html.erb
app/views/email_templates/index.html.erb
app/views/email_templates/new.html.erb
app/views/email_templates/show.html.erb
app/views/profile/send_mail.html.erb
app/views/profile_editor/index.html.erb
app/views/tasks/_task_reject_details.html.erb
db/migrate/20150609105354_create_email_template.rb
@@ -26,6 +26,7 @@ gem &#39;grape_logging&#39;
 gem 'api-pagination',           '~> 4.1.1'
 gem 'rack-cors'
 gem 'rack-contrib'
+gem 'liquid',                    '~> 3.0.3'
 # asset pipeline
 gem 'uglifier', '>= 1.0.3'
@@ -0,0 +1,63 @@
+class EmailTemplatesController < MyProfileController
+
+  protect 'send_mail_to_members', :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
@@ -4,6 +4,8 @@ class TasksController &lt; MyProfileController
   protect :perform_task, :profile, :except => [:index, :save_tags, :search_tags]
   def index
+    @email_templates = profile.email_templates.find_all_by_template_type(:task_rejection)
+
     @filter_type = params[:filter_type].presence
     @filter_text = params[:filter_text].presence
     @filter_responsible = params[:filter_responsible]
@@ -356,6 +356,7 @@ class ProfileController &lt; PublicController
   def send_mail
     @mailing = profile.mailings.build(params[:mailing])
+    @email_templates = profile.email_templates.find_all_by_template_type(:organization_members)
     if request.post?
       @mailing.locale = locale
       @mailing.person = user
@@ -33,11 +33,15 @@ 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(
       to: task.requestor.notification_emails,
       from: self.class.generate_from(task),
-      subject: '[%s] %s' % [task.requestor.environment.name, task.target_notification_description]
+      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
     )
   end
@@ -0,0 +1,31 @@
+class EmailTemplate < ActiveRecord::Base
+
+  belongs_to :owner, :polymorphic => true
+
+  attr_accessible :template_type, :subject, :body, :owner, :name
+
+  validates_presence_of :name
+
+  def parsed_body(params)
+    @parsed_body ||= parse(body, params)
+  end
+
+  def parsed_subject(params)
+    @parsed_subject ||= parse(subject, params)
+  end
+
+  def available_types
+    HashWithIndifferentAccess.new ({
+      :task_rejection => {:description => _('Task Rejection')},
+      :organization_members => {:description => _('Organization Members')}
+    })
+  end
+
+  protected
+
+  def parse(source, params)
+    template = Liquid::Template.parse(source)
+    template.render(HashWithIndifferentAccess.new(params))
+  end
+
+end
@@ -982,6 +982,10 @@ class Environment &lt; ActiveRecord::Base
     self.licenses.any?
   end
+  def to_liquid
+    HashWithIndifferentAccess.new :name => name
+  end
+
   private
   def default_language_available
@@ -3,7 +3,7 @@ require &#39;builder&#39;
 class Event < Article
-  attr_accessible :start_date, :end_date, :link, :address, :start_hour, :start_minute, :presenter
+  attr_accessible :start_date, :end_date, :link, :address, :presenter
   def self.type_name
     _('Event')
@@ -189,6 +189,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
@@ -509,6 +511,10 @@ class Profile &lt; ActiveRecord::Base
     self.articles.find(:all, options)
   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
@@ -42,6 +42,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
@@ -237,6 +239,17 @@ 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
+    })
+  end
+
   scope :pending, :conditions => { :status =>  Task::Status::ACTIVE }
   scope :hidden, :conditions => { :status =>  Task::Status::HIDDEN }
   scope :finished, :conditions => { :status =>  Task::Status::FINISHED }
@@ -14,10 +14,6 @@
 <%= labelled_form_field(_('Presenter:'), text_field(:article, :presenter)) %>
-<%= labelled_form_field(_('End time'), time_select(:article, :end_date)) %>
-
-<%= labelled_form_field(_('Presenter:'), text_field(:article, :presenter)) %>
-
 <%= labelled_form_field(_('Event website:'), text_field(:article, :link)) %>
 <%= labelled_form_field(_('Address:'), text_field(:article, :address)) %>
@@ -0,0 +1,31 @@
+<%= form_for(@email_template, :url => {:controller => :email_templates, :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">
+        {{profile.name}}, {{profile.identifier}}, {{environment.name}}
+      </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'), :controller => :email_templates) %>
+  </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.available_types[email_template.template_type][:description] if email_template.template_type.present? %></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?' }) %>
+      </td>
+    </tr>
+  <% end %>
+  </table>
+
+  <br />
+
+  <%= button(:new, _('New template'), :controller => :email_templates, :action => :new) %>
+  <%= button(:back, _('Back to control panel'), :controller => :profile_editor) %>
+</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(:controller => :email_templates, :action => :edit, :id => @email_template.id) %> |
+<%= link_to 'Back', url_for(:controller => :email_templates) %>
@@ -4,6 +4,12 @@
 <%= error_messages_for :mailing %>
+<% 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'))) %>
+  </div>
+<% end %>
+
 <%= form_for :mailing, :url => {:action => 'send_mail'}, :html => {:id => 'mailing-form'} do |f| %>
   <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
@@ -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 => :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 %>
+<% if @email_templates.present? %>
+  <div class="template-selection">
+    <%= labelled_form_field(_('Select a rejection email template:'), select_tag("tasks[#{task.id}][task][email_template_id]", options_from_collection_for_select(@email_templates, :id, :name), :include_blank => true, 'data-url' => url_for(:controller => 'email_templates', :action => 'show_parsed'))) %>
+  </div>
+<% end %>
+
 <%= labelled_form_field(_('Rejection explanation'), f.text_area(:reject_explanation, :rows => 5)) %>
@@ -0,0 +1,14 @@
+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
@@ -1,13 +0,0 @@
-class AlterColumnArticlesStartDate < ActiveRecord::Migration
-  def up
-    change_table :articles do |t|
-      t.change :start_date, :datetime
-    end
-  end
-
-  def down
-    change_table :articles do |t|
-      t.change :start_date, :date
-    end
-  end
-end
@@ -1,13 +0,0 @@
-class AlterColumnArticlesEndDate < ActiveRecord::Migration
-  def up
-    change_table :articles do |t|
-      t.change :end_date, :datetime
-    end
-  end
-
-  def down
-    change_table :articles do |t|
-      t.change :end_date, :date
-    end
-  end
-end
@@ -1,13 +0,0 @@
-class AlterColumnArticleVersionsEndDate < ActiveRecord::Migration
-  def up
-    change_table :article_versions do |t|
-      t.change :end_date, :datetime
-    end
-  end
-
-  def down
-    change_table :article_versions do |t|
-      t.change :end_date, :date
-    end
-  end
-end
@@ -1,13 +0,0 @@
-class AlterColumnArticleVersionsStartDate < ActiveRecord::Migration
-  def up
-    change_table :article_versions do |t|
-      t.change :start_date, :datetime
-    end
-  end
-
-  def down
-    change_table :article_versions do |t|
-      t.change :start_date, :date
-    end
-  end
-end
 \ No newline at end of file
 gem 'rdf'
 gem 'rdf-virtuoso'
 gem 'oai'
-gem 'liquid'
+gem 'liquid',                    '~> 3.0.3'
 gem 'roadie'
 gem 'roadie-rails'
@@ -32,6 +32,7 @@
 *= require block-store.js
 *= require jquery.typewatch.js
 *= require require_login.js
+*= require email_templates.js
 */
 // scope for noosfero stuff
@@ -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);
+    });
+  });
+});
@@ -15,6 +15,7 @@
  *= require chat
  *= require search
  *= require block-store
+ *= require email-templates
  */
 /* browser fixes */
@@ -4657,6 +4658,9 @@ h1#agenda-title {
 .controller-profile_editor a.control-panel-design-editor {
   background-image: url(../images/control-panel/preferences-desktop-wallpaper.png)
 }
+.controller-profile_editor a.control-panel-email-templates {
+  background-image: url(../images/control-panel/email.png)
+}
 .controller-profile_editor .msie6 a.control-panel-design-editor {
   background-image: url(../images/control-panel/preferences-desktop-wallpaper.gif)
 }
@@ -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;
+}
@@ -0,0 +1,68 @@
+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', 'send_mail_to_members', @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
@@ -1471,6 +1471,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', 0
+    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'])
@@ -626,6 +626,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}/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,22 @@
+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
+
+end
@@ -166,6 +166,35 @@ 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
+
+    environment = Environment.default
+    environment.expects(:noreply_email).returns('sender@example.com')
+    environment.expects(:default_hostname).returns('example.com')
+    environment.expects(:name).returns('example').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
+
   private
     def read_fixture(action)
       IO.readlines("#{FIXTURES_PATH}/task_mailer/#{action}")
	@@ -26,6 +26,7 @@ gem 'grape_logging'		@@ -26,6 +26,7 @@ gem 'grape_logging'
26	gem 'api-pagination', '~> 4.1.1'	26	gem 'api-pagination', '~> 4.1.1'
27	gem 'rack-cors'	27	gem 'rack-cors'
28	gem 'rack-contrib'	28	gem 'rack-contrib'
		29	+gem 'liquid', '~> 3.0.3'
29		30
30	# asset pipeline	31	# asset pipeline
31	gem 'uglifier', '>= 1.0.3'	32	gem 'uglifier', '>= 1.0.3'
@@ -0,0 +1,63 @@		@@ -0,0 +1,63 @@
	1	+class EmailTemplatesController < MyProfileController
	2	+
	3	+ protect 'send_mail_to_members', :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
	@@ -356,6 +356,7 @@ class ProfileController < PublicController		@@ -356,6 +356,7 @@ class ProfileController < PublicController
356		356
357	def send_mail	357	def send_mail
358	@mailing = profile.mailings.build(params[:mailing])	358	@mailing = profile.mailings.build(params[:mailing])
		359	+ @email_templates = profile.email_templates.find_all_by_template_type(:organization_members)
359	if request.post?	360	if request.post?
360	@mailing.locale = locale	361	@mailing.locale = locale
361	@mailing.person = user	362	@mailing.person = user
@@ -0,0 +1,31 @@		@@ -0,0 +1,31 @@
	1	+class EmailTemplate < ActiveRecord::Base
	2	+
	3	+ belongs_to :owner, :polymorphic => true
	4	+
	5	+ attr_accessible :template_type, :subject, :body, :owner, :name
	6	+
	7	+ validates_presence_of :name
	8	+
	9	+ def parsed_body(params)
	10	+ @parsed_body \|\|= parse(body, params)
	11	+ end
	12	+
	13	+ def parsed_subject(params)
	14	+ @parsed_subject \|\|= parse(subject, params)
	15	+ end
	16	+
	17	+ def available_types
	18	+ HashWithIndifferentAccess.new ({
	19	+ :task_rejection => {:description => _('Task Rejection')},
	20	+ :organization_members => {:description => _('Organization Members')}
	21	+ })
	22	+ end
	23	+
	24	+ protected
	25	+
	26	+ def parse(source, params)
	27	+ template = Liquid::Template.parse(source)
	28	+ template.render(HashWithIndifferentAccess.new(params))
	29	+ end
	30	+
	31	+end
	@@ -3,7 +3,7 @@ require 'builder'		@@ -3,7 +3,7 @@ require 'builder'
3		3
4	class Event < Article	4	class Event < Article
5		5
6	- attr_accessible :start_date, :end_date, :link, :address, :start_hour, :start_minute, :presenter	6	+ attr_accessible :start_date, :end_date, :link, :address, :presenter
7		7
8	def self.type_name	8	def self.type_name
9	_('Event')	9	_('Event')
	@@ -42,6 +42,8 @@ class Task < ActiveRecord::Base		@@ -42,6 +42,8 @@ class Task < ActiveRecord::Base
42		42
43	attr_protected :status	43	attr_protected :status
44		44
		45	+ settings_items :email_template_id, :type => :integer
		46	+
45	def initialize(*args)	47	def initialize(*args)
46	super	48	super
47	self.status = (args.first ? args.first[:status] : nil) \|\| Task::Status::ACTIVE	49	self.status = (args.first ? args.first[:status] : nil) \|\| Task::Status::ACTIVE
	@@ -237,6 +239,17 @@ class Task < ActiveRecord::Base		@@ -237,6 +239,17 @@ class Task < ActiveRecord::Base
237	end	239	end
238	end	240	end
239		241
		242	+ def email_template
		243	+ @email_template \|\|= email_template_id.present? ? EmailTemplate.find_by_id(email_template_id) : nil
		244	+ end
		245	+
		246	+ def to_liquid
		247	+ HashWithIndifferentAccess.new({
		248	+ :requestor => requestor,
		249	+ :reject_explanation => reject_explanation
		250	+ })
		251	+ end
		252	+
240	scope :pending, :conditions => { :status => Task::Status::ACTIVE }	253	scope :pending, :conditions => { :status => Task::Status::ACTIVE }
241	scope :hidden, :conditions => { :status => Task::Status::HIDDEN }	254	scope :hidden, :conditions => { :status => Task::Status::HIDDEN }
242	scope :finished, :conditions => { :status => Task::Status::FINISHED }	255	scope :finished, :conditions => { :status => Task::Status::FINISHED }
@@ -0,0 +1,31 @@		@@ -0,0 +1,31 @@
	1	+<%= form_for(@email_template, :url => {:controller => :email_templates, :action => @email_template.persisted? ? :update : :create, :id => @email_template.id}) do \|f\| %>
	2	+
	3	+ <%= error_messages_for :email_template if @email_template.errors.any? %>
	4	+
	5	+ <div class="template-fields">
	6	+ <div class="header-fields">
	7	+ <%= labelled_form_field(_('Template Name:'), f.text_field(:name)) %>
	8	+ <%= labelled_form_field(_('Template Type:'), f.select(:template_type, @email_template.available_types.map {\|k,v\| [v[:description], k]}, :include_blank => true)) %>
	9	+ <%= labelled_form_field(_('Subject:'), f.text_field(:subject)) %>
	10	+ </div>
	11	+ <div class="available-params">
	12	+ <div class="reference">
	13	+ <a target="_blank" href="https://github.com/Shopify/liquid/wiki/Liquid-for-Designers"><%= _('Template language reference') %></a>
	14	+ </div>
	15	+ <div class="label">
	16	+ <%= _('The following parameters may be used in subject and body:') %>
	17	+ </div>
	18	+ <div class="values">
	19	+ {{profile.name}}, {{profile.identifier}}, {{environment.name}}
	20	+ </div>
	21	+ </div>
	22	+ <%= render :file => 'shared/tiny_mce' %>
	23	+ <%= labelled_form_field(_('Body:'), f.text_area(:body, :class => 'mceEditor')) %>
	24	+ </div>
	25	+
	26	+ <div class="actions">
	27	+ <%= submit_button(:save, _('Save')) %>
	28	+ <%= button(:back, _('Back'), :controller => :email_templates) %>
	29	+ </div>
	30	+
	31	+<% end %>
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+<h1>Editing Email Template</h1>
	2	+
	3	+<%= render 'form' %>
@@ -0,0 +1,27 @@		@@ -0,0 +1,27 @@
	1	+<div class="email-templates">
	2	+ <h1><%= _('Email Templates') %></h1>
	3	+
	4	+ <table>
	5	+ <tr>
	6	+ <th><%= _('Name') %></th>
	7	+ <th><%= _('Type') %></th>
	8	+ <th><%= _('Actions') %></th>
	9	+ </tr>
	10	+
	11	+ <% @email_templates.each do \|email_template\| %>
	12	+ <tr>
	13	+ <td><%= email_template.name %></td>
	14	+ <td><%= email_template.available_types[email_template.template_type][:description] if email_template.template_type.present? %></td>
	15	+ <td>
	16	+ <%= button_without_text(:edit, _('Edit'), {:controller => :email_templates, :action => :edit, :id => email_template.id}) %>
	17	+ <%= button_without_text(:remove, _('Remove'), {:controller => :email_templates, :action => :destroy, :id => email_template.id}, method: :delete, data: { confirm: 'Are you sure?' }) %>
	18	+ </td>
	19	+ </tr>
	20	+ <% end %>
	21	+ </table>
	22	+
	23	+ <br />
	24	+
	25	+ <%= button(:new, _('New template'), :controller => :email_templates, :action => :new) %>
	26	+ <%= button(:back, _('Back to control panel'), :controller => :profile_editor) %>
	27	+</div>
@@ -0,0 +1,3 @@		@@ -0,0 +1,3 @@
	1	+<h1>New Email Template</h1>
	2	+
	3	+<%= render 'form' %>