Changeset 1772
- Timestamp:
- 08/28/08 11:19:23 (3 months ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
hive/trunk/data_webapp/app/models/drone_job.rb
r1703 r1772 21 21 # Extract the set of URLs 22 22 urls = obj_hash.delete(:queue_urls) 23 24 # Extract the original message 25 original_message = obj_hash.delete(:original_message) 23 26 24 27 # Create a DroneJob … … 43 46 # If requested, send notification that the DroneJob has been processed. 44 47 if job.notify_source and job.job_source.response_protocol == 'smtp' 45 PostOffice.deliver_job_submitted(job )48 PostOffice.deliver_job_submitted(job, original_message) 46 49 end 47 50 hive/trunk/data_webapp/app/models/post_office.rb
r1630 r1772 1 1 class PostOffice < ActionMailer::Base 2 def job_submitted(job )2 def job_submitted(job, original_message) 3 3 return if not job.is_a?(DroneJob) 4 4 @recipients = job.job_source.response_address … … 11 11 body[:queue_urls] = job.queue_urls 12 12 body[:job_id] = job.id.nil? ? 0 : job.id 13 body[:original_message] = original_message 13 14 if (body[:job_id] > 0) and (body[:num_urls] > 0) 14 15 body[:status] = 'Submitted' hive/trunk/data_webapp/app/views/post_office/job_submitted.text.plain.erb
r1628 r1772 15 15 BLOCKED::<%= q.url.to_s %> (<%= q.last_visited_at == 0 ? "never" : time_ago(q.last_visited_at) %>) 16 16 <%- end -%> 17 18 -----Original Message----- 19 <%= @original_message.to_s %>
