app/models/imports/events_import.rb in artfully_ose-1.2.0.pre.3 vs app/models/imports/events_import.rb in artfully_ose-1.2.0.pre.4

- old
+ new

@@ -36,27 +36,9 @@ valid_amount? parsed_row.unparsed_amount unless parsed_row.unparsed_amount.blank? valid_date? parsed_row.order_date unless parsed_row.order_date.blank? true end - def create_person(parsed_row) - if !attach_person(parsed_row).naming_details_available? - person = self.organization.dummy - elsif !parsed_row.email.blank? - person = Person.first_or_create({:email => parsed_row.email, :organization => self.organization}.merge(parsed_row.person_attributes), {}) do |p| - p.import = self - end - else - person = attach_person(parsed_row) - if !person.save - self.import_errors.create! :row_data => parsed_row.row, :error_message => person.errors.full_messages.join(", ") - self.reload - fail! - end - end - person - end - def create_chart(parsed_row, event, show) Rails.logger.info("Import #{id} EVENT_IMPORT: Creating chart") chart = show.chart || show.create_chart({ :name => event.name, :skip_create_first_section => true }) Rails.logger.info("Import #{id} EVENT_IMPORT: Using chart:") Rails.logger.info("Import #{id} EVENT_IMPORT: #{chart.inspect}") \ No newline at end of file