diff --git a/plugins/work_assignment/controllers/myprofile/work_assignment_plugin_cms_controller.rb b/plugins/work_assignment/controllers/myprofile/work_assignment_plugin_cms_controller.rb index 6be6e7b..222b1fd 100644 --- a/plugins/work_assignment/controllers/myprofile/work_assignment_plugin_cms_controller.rb +++ b/plugins/work_assignment/controllers/myprofile/work_assignment_plugin_cms_controller.rb @@ -92,4 +92,29 @@ class WorkAssignmentPluginCmsController < CmsController redirect_to referer end end + +#TODO +#Refatorar o método send_email para utilizar o build_mail_message para inserir o link dos arquivos +=begin + def build_mail_message + @files_paths = [] + @files_string = params[:self_files_id] + @files_id_list = @files_string.split(' ') + + @files_id_list.each do |file_id| + @file = environment.articles.find_by_id(file_id) + @real_file_url = "http://#{@file.url[:host]}:#{@file.url[:port]}/#{@file.url[:profile]}/#{@file.path}" + @files_paths << @real_file_url + unless params[:email_contact][:message].include? "#{@real_file_url}" + params[:email_contact][:message] += "
Clique aqui para acessar o arquivo ou acesse pela URL:
" + params[:email_contact][:message] += "
#{@real_file_url}" + end + end + @message = "AVISO: O aluno deve imprimir este email e entrega-lo na secretaria como comprovante do envio!" + unless params[:email_contact][:message].include? "#{@message}" + params[:email_contact][:message] += "

#{@message}" + end + end +=end + end \ No newline at end of file diff --git a/plugins/work_assignment/lib/ext/email_contact.rb b/plugins/work_assignment/lib/ext/email_contact.rb index 4abb642..ea4751f 100644 --- a/plugins/work_assignment/lib/ext/email_contact.rb +++ b/plugins/work_assignment/lib/ext/email_contact.rb @@ -40,6 +40,7 @@ class EmailContact to: email_contact.reciever, reply_to: email_contact.email, subject: email_contact.subject, + message: email_contact.message, from: "#{email_contact.name} <#{email_contact.email}>" } diff --git a/plugins/work_assignment/lib/work_assignment_plugin.rb b/plugins/work_assignment/lib/work_assignment_plugin.rb index af7b6b0..f3481ea 100644 --- a/plugins/work_assignment/lib/work_assignment_plugin.rb +++ b/plugins/work_assignment/lib/work_assignment_plugin.rb @@ -50,6 +50,7 @@ class WorkAssignmentPlugin < Noosfero::Plugin :options => {:only => 'view_page'}, :block => block } end + def upload_files_extra_contents proc do diff --git a/plugins/work_assignment/views/work_assignment_plugin_cms/_work_assignment_form.html.erb b/plugins/work_assignment/views/work_assignment_plugin_cms/_work_assignment_form.html.erb index e00a3e8..872e317 100644 --- a/plugins/work_assignment/views/work_assignment_plugin_cms/_work_assignment_form.html.erb +++ b/plugins/work_assignment/views/work_assignment_plugin_cms/_work_assignment_form.html.erb @@ -1,5 +1,5 @@ <% form_for('uploaded_file', :url => { :controller => 'work_assignment_plugin_cms', :action => 'upload_files' }, :html => {:multipart => true}) do |f| %> <%= render :partial => 'notify_checkbox', :locals => { :size => '45'} %> <%= render :partial => 'upload_file_form', :locals => { :size => '45'} %> - x + <% end %> \ No newline at end of file -- libgit2 0.21.2