Manage environment email templates

Victor Costa
1 parent 3af4c864
Showing 18 changed files with 248 additions and 144 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/task_helper.rb
app/models/email_template.rb
app/models/environment.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
test/functional/environment_email_templates_controller_test.rb
test/functional/profile_editor_controller_test.rb
test/functional/profile_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(:owner => profile)
-  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
@@ -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
@@ -31,6 +31,10 @@ class EmailTemplate &lt; ActiveRecord::Base
     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
@@ -51,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
@@ -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>
-<%= 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
@@ -0,0 +1,15 @@		@@ -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 @@		@@ -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,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(:owner => profile)
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 @@		@@ -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
	@@ -5,7 +5,7 @@ module TaskHelper		@@ -5,7 +5,7 @@ module TaskHelper
5		5
6	content_tag(	6	content_tag(
7	:div,	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	:class => 'template-selection'	9	:class => 'template-selection'
10	)	10	)
11	end	11	end
	@@ -51,6 +51,7 @@ class Environment < ActiveRecord::Base		@@ -51,6 +51,7 @@ class Environment < ActiveRecord::Base
51	'manage_environment_licenses' => N_('Manage environment licenses'),	51	'manage_environment_licenses' => N_('Manage environment licenses'),
52	'manage_environment_trusted_sites' => N_('Manage environment trusted sites'),	52	'manage_environment_trusted_sites' => N_('Manage environment trusted sites'),
53	'edit_appearance' => N_('Edit appearance'),	53	'edit_appearance' => N_('Edit appearance'),
		54	+ 'manage_email_templates' => N_('Manage Email Templates'),
54	}	55	}
55		56
56	module Roles	57	module Roles
	@@ -11,6 +11,7 @@		@@ -11,6 +11,7 @@
11	<tr><td><%= link_to _('Homepage'), :action => 'set_portal_community' %></td></tr>	11	<tr><td><%= link_to _('Homepage'), :action => 'set_portal_community' %></td></tr>
12	<tr><td><%= link_to _('Licenses'), :controller =>'licenses' %></td></tr>	12	<tr><td><%= link_to _('Licenses'), :controller =>'licenses' %></td></tr>
13	<tr><td><%= link_to _('Trusted sites'), :controller =>'trusted_sites' %></td></tr>	13	<tr><td><%= link_to _('Trusted sites'), :controller =>'trusted_sites' %></td></tr>
		14	+ <tr><td><%= link_to _('Email templates'), :controller =>'environment_email_templates' %></td></tr>
14	</table>	15	</table>
15		16
16	<h2><%= _('Profiles') %></h2>	17	<h2><%= _('Profiles') %></h2>
1	-<%= form_for(@email_template, :url => {:controller => :email_templates, :action => @email_template.persisted? ? :update : :create, :id => @email_template.id}) do \|f\| %>	1	+<%= form_for(@email_template, :url => {:action => @email_template.persisted? ? :update : :create, :id => @email_template.id}) do \|f\| %>
2		2
3	<%= error_messages_for :email_template if @email_template.errors.any? %>	3	<%= error_messages_for :email_template if @email_template.errors.any? %>
4		4
	@@ -25,7 +25,7 @@		@@ -25,7 +25,7 @@
25		25
26	<div class="actions">	26	<div class="actions">
27	<%= submit_button(:save, _('Save')) %>	27	<%= submit_button(:save, _('Save')) %>
28	- <%= button(:back, _('Back'), :controller => :email_templates) %>	28	+ <%= button(:back, _('Back'), :action => :index) %>
29	</div>	29	</div>
30		30
31	<% end %>	31	<% end %>
1	<p id="notice"><%= notice %></p>	1	<p id="notice"><%= notice %></p>
2		2
3		3
4	-<%= link_to 'Edit', url_for(:controller => :email_templates, :action => :edit, :id => @email_template.id) %> \|
5	-<%= link_to 'Back', url_for(:controller => :email_templates) %>	4	+<%= link_to 'Edit', url_for(:action => :edit, :id => @email_template.id) %> \|
		5	+<%= link_to 'Back', url_for(:action => :index) %>
	@@ -6,7 +6,7 @@		@@ -6,7 +6,7 @@
6		6
7	<% if @email_templates.present? %>	7	<% if @email_templates.present? %>
8	<div class="template-selection">	8	<div class="template-selection">
9	- <%= 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'))) %>	9	+ <%= 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'))) %>
10	</div>	10	</div>
11	<% end %>	11	<% end %>
12		12