Mercurial > hg > soundsoftware-site
changeset 292:5f4ac0a159fa bug_97
DEV commit: created template; need to solve bug in template variables.
| author | luisf |
|---|---|
| date | Wed, 23 Mar 2011 22:22:51 +0000 |
| parents | f3b2dc533e83 |
| children | b133cb3ce3b1 |
| files | app/controllers/members_controller.rb app/models/mailer.rb app/views/mailer/added_to_project.text.html.rhtml app/views/mailer/added_to_project.text.plain.rhtml config/locales/en-GB.yml config/locales/en.yml |
| diffstat | 6 files changed, 13 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/app/controllers/members_controller.rb Wed Mar 23 17:38:13 2011 +0000 +++ b/app/controllers/members_controller.rb Wed Mar 23 22:22:51 2011 +0000 @@ -32,7 +32,7 @@ members << @new_member # send notification to member - Mailer.deliver_add_to_project(@new_member, @project) + Mailer.deliver_added_to_project(@new_member, @project) end else @@ -40,7 +40,7 @@ members << @new_member # send notification to member - Mailer.deliver_add_to_project(@new_member, @project) + Mailer.deliver_added_to_project(@new_member, @project) end
--- a/app/models/mailer.rb Wed Mar 23 17:38:13 2011 +0000 +++ b/app/models/mailer.rb Wed Mar 23 22:22:51 2011 +0000 @@ -39,16 +39,16 @@ # Example: # add_to_project(user) => tmail object # Mailer.deliver_add_to_project(user) => sends an email to the registered user - def add_to_project(member, project) + def added_to_project(member, project) user = User.find(member.user_id) set_language_if_valid user.language recipients user.mail subject l(:mail_subject_register, Setting.app_title) - body :user => user, - :login_url => url_for(:controller => 'account', :action => 'login') - render_multipart('account_activated', body) + body :project_url => url_for(:controller => 'project', :action => 'view'), + :project_name => project.name + render_multipart('added_to_project', body) end
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/views/mailer/added_to_project.text.html.rhtml Wed Mar 23 22:22:51 2011 +0000 @@ -0,0 +1,2 @@ +<p><%= l(:notice_added_to_project, :project_name => @project_name) %></p> +<p><%= l(:label_login) %>: <%= link_to @login_url, @login_url %></p>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/app/views/mailer/added_to_project.text.plain.rhtml Wed Mar 23 22:22:51 2011 +0000 @@ -0,0 +1,2 @@ +<%= l(:notice_added_to_project, @project_name) %> +<%= l(:label_login) %>: <%= @project_url %>
--- a/config/locales/en-GB.yml Wed Mar 23 17:38:13 2011 +0000 +++ b/config/locales/en-GB.yml Wed Mar 23 22:22:51 2011 +0000 @@ -971,4 +971,5 @@ label_developer_description: Can commit to repository and carry out most project editing tasks label_reporter_description: Can submit bug reports; has read access for private projects - label_set_role_plural: Choose roles for new member \ No newline at end of file + label_set_role_plural: Choose roles for new member + notice_added_to_project: "You have been added to the project {{project_name}}." \ No newline at end of file
--- a/config/locales/en.yml Wed Mar 23 17:38:13 2011 +0000 +++ b/config/locales/en.yml Wed Mar 23 22:22:51 2011 +0000 @@ -965,4 +965,5 @@ label_reporter_description: Can submit bug reports; has read access for private projects label_set_role_plural: Choose roles for new member + notice_added_to_project: "You have been added to the project {{project_name}}."