enju_event 0.1.17.pre18 → 0.1.17.pre19

data/app/models/event_import_file.rb

@@ -1,7 +1,8 @@
 class EventImportFile < ActiveRecord::Base
   include Statesman::Adapters::ActiveRecordModel
   include ImportFile
-  attr_accessible :event_import, :edit_mode, :user_encoding, :mode
+  attr_accessible :event_import, :edit_mode, :user_encoding, :mode,
+    :default_library_id, :default_event_category_id
   default_scope {order('event_import_files.id DESC')}
   scope :not_imported, -> {in_state(:pending)}
   scope :stucked, -> {in_state(:pending).where('created_at < ?', 1.hour.ago)}
@@ -12,7 +13,7 @@ class EventImportFile < ActiveRecord::Base
       :s3_permissions => :private
   else
     has_attached_file :event_import,
-      :path => ":rails_root/private/system/:class/:attachment/:id_partition/:style/:filename"
+      path: ":rails_root/private/system/:class/:attachment/:id_partition/:style/:filename"
   end
   validates_attachment_content_type :event_import, :content_type => [
     'text/csv',
@@ -22,7 +23,9 @@ class EventImportFile < ActiveRecord::Base
     'application/vnd.ms-excel'
   ]
   validates_attachment_presence :event_import
-  belongs_to :user, :validate => true
+  belongs_to :user, validate: true
+  belongs_to :default_library, class_name: 'Library'
+  belongs_to :default_event_category, class_name: 'EventCategory'
   has_many :event_import_results
 
   has_many :event_import_file_transitions
@@ -40,7 +43,7 @@ class EventImportFile < ActiveRecord::Base
   def import
     transition_to!(:started)
     num = {:imported => 0, :failed => 0}
-    rows = open_import_file(create_import_temp_file)
+    rows = open_import_file(create_import_temp_file(event_import))
     check_field(rows.first)
     row_num = 1
 
@@ -48,24 +51,26 @@ class EventImportFile < ActiveRecord::Base
       row_num += 1
       next if row['dummy'].to_s.strip.present?
       event_import_result = EventImportResult.new
-      event_import_result.assign_attributes({:event_import_file_id => id, :body => row.fields.join("\t")}, as: :admin)
+      event_import_result.assign_attributes({:event_import_file_id => id, body: row.fields.join("\t")}, as: :admin)
       event_import_result.save!
 
       event = Event.new
       event.name = row['name'].to_s.strip
+      event.display_name = row['display_name']
       event.note = row['note']
-      event.start_at = row['start_at']
-      event.end_at = row['end_at']
-      category = row['category'].to_s.strip
-      if row['all_day'].to_s.strip.downcase == 'false'
-        event.all_day = false
-      else
+      event.start_at = Time.zone.parse(row['start_at']) if row['start_at'].present?
+      event.end_at = Time.zone.parse(row['end_at']) if row['end_at'].present?
+      category = row['event_category'].to_s.strip
+      if %w(t true TRUE).include?(row['all_day'].to_s.strip)
         event.all_day = true
+      else
+        event.all_day = false
       end
-      library = Library.where(:name => row['library']).first
-      library = Library.web if library.blank?
+      library = Library.where(name: row['library']).first
+      library = default_library || Library.web if library.blank?
       event.library = library
-      event_category = EventCategory.where(:name => category).first || EventCategory.where(:name => 'unknown').first
+      event_category = EventCategory.where(name: row['event_category']).first
+      event_category = default_event_category if event_category.blank?
       event.event_category = event_category
 
       if event.save 
@@ -83,7 +88,8 @@ class EventImportFile < ActiveRecord::Base
     Sunspot.commit
     rows.close
     transition_to!(:completed)
-    return num
+    send_message
+    num
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
     transition_to!(:failed)
@@ -92,7 +98,7 @@ class EventImportFile < ActiveRecord::Base
 
   def modify
     transition_to!(:started)
-    rows = open_import_file(create_import_temp_file)
+    rows = open_import_file(create_import_temp_file(event_import))
     check_field(rows.first)
     row_num = 1
 
@@ -100,18 +106,18 @@ class EventImportFile < ActiveRecord::Base
       row_num += 1
       next if row['dummy'].to_s.strip.present?
       event = Event.find(row['id'].to_s.strip)
-      event_category = EventCategory.where(:name => row['category'].to_s.strip).first
+      event_category = EventCategory.where(name: row['event_category'].to_s.strip).first
       event.event_category = event_category if event_category
-      library = Library.where(:name => row['library'].to_s.strip).first
+      library = Library.where(name: row['library'].to_s.strip).first
       event.library = library if library
       event.name = row['name'] if row['name'].to_s.strip.present?
-      event.start_at = row['start_at'] if row['start_at'].to_s.strip.present?
-      event.end_at = row['end_at'] if row['end_at'].to_s.strip.present?
-      event.note = row['end_at'] if row['note'].to_s.strip.present?
-      if row['all_day'].to_s.strip.downcase == 'false'
-        event.all_day = false
-      else
+      event.start_at = Time.zone.parse(row['start_at']) if row['start_at'].present?
+      event.end_at = Time.zone.parse(row['end_at']) if row['end_at'].present?
+      event.note = row['note'] if row['note'].to_s.strip.present?
+      if %w(t true TRUE).include?(row['all_day'].to_s.strip)
         event.all_day = true
+      else
+        event.all_day = false
       end
       event.save!
     end
@@ -124,7 +130,7 @@ class EventImportFile < ActiveRecord::Base
 
   def remove
     transition_to!(:started)
-    rows = open_import_file(create_import_temp_file)
+    rows = open_import_file(create_import_temp_file(event_import))
     rows.shift
     row_num = 1
 
@@ -156,28 +162,20 @@ class EventImportFile < ActiveRecord::Base
     EventImportFileTransition
   end
 
-  def create_import_temp_file
-    tempfile = Tempfile.new(self.class.name.underscore)
-    if Setting.uploaded_file.storage == :s3
-      uploaded_file_path = event_import.expiring_url(10)
-    else
-      uploaded_file_path = event_import.path
-    end
-    open(uploaded_file_path){|f|
-      f.each{|line|
-        tempfile.puts(convert_encoding(line))
-      }
-    }
-    tempfile.close
-    tempfile
-  end
-
   def open_import_file(tempfile)
-    file = CSV.open(tempfile, :col_sep => "\t")
+    file = CSV.open(tempfile, col_sep: "\t")
+    header_columns = %w(
+      id name display_name library event_category start_at end_at all_day note dummy
+    )
     header = file.first
-    rows = CSV.open(tempfile, :headers => header, :col_sep => "\t")
+    ignored_columns = header - header_columns
+    unless ignored_columns.empty?
+      self.error_message = I18n.t('import.following_column_were_ignored', column: ignored_columns.join(', '))
+      save!
+    end
+    rows = CSV.open(tempfile, headers: header, col_sep: "\t")
     event_import_result = EventImportResult.new
-    event_import_result.assign_attributes({:event_import_file_id => id, :body => header.join("\t")}, as: :admin)
+    event_import_result.assign_attributes({:event_import_file_id => id, body: header.join("\t")}, as: :admin)
     event_import_result.save!
     tempfile.close(true)
     file.close
@@ -215,5 +213,6 @@ end
 #  event_import_fingerprint  :string(255)
 #  error_message             :text
 #  user_encoding             :string(255)
+#  default_library_id        :integer
+#  default_event_category_id :integer
 #
-

data/app/models/event_import_result.rb

@@ -1,6 +1,6 @@
 class EventImportResult < ActiveRecord::Base
-  attr_accessible :event_id, :event_import_file_id, :body, :as => :admin
-  default_scope :order => 'event_import_results.id'
+  attr_accessible :event_id, :event_import_file_id, :body, as: :admin
+  default_scope order: 'event_import_results.id'
   scope :file_id, proc{|file_id| {:conditions => {:event_import_file_id => file_id}}}
   scope :failed, where(:event_id => nil)
 

data/app/models/participate.rb

@@ -4,8 +4,8 @@ class Participate < ActiveRecord::Base
   belongs_to :event
 
   validates_presence_of :agent_id, :event_id
-  validates_uniqueness_of :agent_id, :scope => :event_id
-  acts_as_list :scope => :event_id
+  validates_uniqueness_of :agent_id, scope: :event_id
+  acts_as_list scope: :event_id
 
   paginates_per 10
 end

data/app/views/calendar/index.html.erb

@@ -1,7 +1,7 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
   <%- if @library -%>
     <h1 class="title">
-      <%= t('calendar.library_calendar', :library_name => @library.display_name.localize) -%>
+      <%= t('calendar.library_calendar', library_name: @library.display_name.localize) -%>
     </h1>
   <%- else -%>
     <h1 class="title">
@@ -24,9 +24,9 @@
 
     <p>
       <%- if @library -%>
-        (<%= link_to 'iCalendar', library_events_path(@library, :format => :ics) -%>)
+        (<%= link_to 'iCalendar', library_events_path(@library, format: :ics) -%>)
       <%- else -%>
-        (<%= link_to 'iCalendar', events_path(:format => :ics) -%>)
+        (<%= link_to 'iCalendar', events_path(format: :ics) -%>)
       <%- end -%>
     </p>
 
@@ -36,10 +36,10 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.listing', :model => t('activerecord.models.event')), events_path -%></li>
-    <li><%= link_to t('page.show_all'), :controller => :calendar, :action => :index -%></li>
+    <li><%= link_to t('page.listing', model: t('activerecord.models.event')), events_path -%></li>
+    <li><%= link_to t('page.show_all'), controller: :calendar, action: :index -%></li>
     <%- @libraries.each do |library| -%>
-      <li><%= link_to library.display_name.localize, :controller => :calendar, :action => :index, :library_id => library.name -%></li>
+      <li><%= link_to library.display_name.localize, controller: :calendar, action: :index, library_id: library.name -%></li>
     <%- end -%>
   </ul>
 </div>

data/app/views/event_categories/edit.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.event_category')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.event_category')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

data/app/views/event_categories/index.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.event_category')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.event_category')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -26,7 +26,7 @@
         <%= link_to t('page.edit'), edit_event_category_path(event_category) -%>
       <% end %>
       <%- if can? :delete, event_category -%>
-        <%= link_to t('page.destroy'), event_category, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%= link_to t('page.destroy'), event_category, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
   </tr>
@@ -40,7 +40,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <%- if can? :create, EventCategory -%>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.event_category')), new_event_category_path -%></li>
+      <li><%= link_to t('page.new', model: t('activerecord.models.event_category')), new_event_category_path -%></li>
     <%- end -%>
   </ul>
 </div>

data/app/views/event_categories/new.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.event_category')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.event_category')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

data/app/views/event_categories/show.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.event_category')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.event_category')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 

data/app/views/event_export_files/_form.html.erb

@@ -0,0 +1,22 @@
+<%= form_for(@event_export_file) do |f| %>
+  <%= f.error_messages %>
+
+  <%= f.hidden_field :mode, value: 'export' if @event_export_file.new_record? %><br>
+  <!--
+  <div class="field">
+    <%= f.label :user_id %><br>
+    <%= @event_export_file.user.username %>
+  </div>
+  <div class="field">
+    <%= f.label :event_export %><br>
+    <%= f.text_field :event_export %>
+  </div>
+  -->
+  <div class="actions">
+    <% if @event_export_file.new_record? %>
+      <%= f.submit t('page.export') %>
+    <% else %>
+      <%= f.submit %>
+    <% end %>
+  </div>
+<% end %>

data/app/views/event_export_files/edit.html.erb

@@ -0,0 +1,6 @@
+<h1>Editing event_export_file</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @event_export_file %> |
+<%= link_to 'Back', event_export_files_path %>

data/app/views/event_export_files/index.html.erb

@@ -0,0 +1,44 @@
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.event_export_file')) -%></h1>
+<div id="content_list">
+
+<table class="table table-striped index">
+  <thead>
+    <tr>
+      <th>Id</th>
+      <th><%= t('activerecord.models.user') %></th>
+      <th><%= t('activerecord.attributes.event_export_file.event_export_file_name') -%></th>
+      <th><%= t('activerecord.attributes.event_export_file.state') -%></th>
+      <th></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @event_export_files.each do |event_export_file| %>
+      <tr class="line<%= cycle("0", "1") -%>">
+        <td><%= link_to event_export_file.id, event_export_file %></td>
+        <td><%= event_export_file.user.try(:username) %></td>
+        <td>
+          <%= link_to event_export_file.event_export_file_name, event_export_file.event_export.url if event_export_file.event_export.path %>
+          <br />
+          <%= event_export_file.created_at %>
+        </td>
+        <td><%= localized_state(event_export_file.current_state) -%></td>
+        <td>
+          <%= link_to t('page.destroy'), event_export_file, method: :delete, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<%= paginate(@event_export_files) %>
+
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li><%= link_to t('page.new', model: t('activerecord.models.event_export_file')), new_event_export_file_path -%></li>
+  </ul>
+</div>

data/app/views/event_export_files/new.html.erb

@@ -0,0 +1,16 @@
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.event_export_file')) -%></h1>
+<div id="content_list">
+
+  <p><%= t('export.are_you_sure_to_export') %></p>
+
+<%= render 'form' %>
+
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li><%= link_to t('page.listing', model: t('activerecord.models.event_export_file')), event_export_files_path -%></li>
+  </ul>
+</div>

data/app/views/event_export_files/show.html.erb

@@ -0,0 +1,31 @@
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.event_export_file')) -%></h1>
+<div id="content_list">
+<p id="notice"><%= notice %></p>
+
+<p>
+  <strong><%= t('activerecord.models.user') %></strong>
+  <%= @event_export_file.user.try(:username) %>
+</p>
+
+<p>
+  <strong><%= t('activerecord.attributes.event_export_file.event_export_file_name') -%></strong>
+  <%= link_to @event_export_file.event_export_file_name, @event_export_file.event_export.url if @event_export_file.event_export_file_name %>
+</p>
+
+<p>
+  <strong><%= t('activerecord.attributes.event_export_file.state') -%>:</strong>
+  <%= localized_state(@event_export_file.current_state) -%>
+</p>
+
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <ul>
+    <li><%= back_to_index(flash[:page_info]) -%></li>
+    <% if current_user.has_role?('Administrator') %>
+      <li><%= link_to 'Resque', resque_path %></li>
+    <% end %>
+  </ul>
+</div>

data/app/views/event_import_files/edit.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.event_import_file')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.event_import_file')) -%></h1>
 <div id="content_list">
 
 <%= form_for(@event_import_file) do |f| -%>

data/app/views/event_import_files/index.html.erb

@@ -1,32 +1,37 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.event_import_file')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.event_import_file')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
-  <tr>
-    <th>Id</th>
-    <th><%= t('activerecord.attributes.event_import_file.event_import_file_name') -%></th>
-    <th><%= t('activerecord.attributes.event_import_file.executed_at') -%></th>
-    <th><%= t('activerecord.models.user') -%></th>
-    <th><%= t('activerecord.attributes.event_import_file.edit_mode') -%></th>
-    <th><%= t('activerecord.attributes.event_import_file.state') -%></th>
-    <th></th>
-  </tr>
+  <thead>
+    <tr>
+      <th style="width: 30px">Id</th>
+      <th><%= t('activerecord.attributes.event_import_file.event_import_file_name') -%></th>
+      <th><%= t('activerecord.attributes.event_import_file.edit_mode') -%></th>
+      <th><%= t('activerecord.attributes.event_import_file.executed_at') -%></th>
+      <th><%= t('activerecord.attributes.event_import_file.state') -%></th>
+      <th></th>
+    </tr>
+  </thead>
 
-<%- @event_import_files.each do |event_import_file| -%>
-  <tr class="line<%= cycle("0", "1") -%>">
-    <td><%= link_to (event_import_file.id), event_import_file -%></td>
-    <td><%= link_to event_import_file.event_import_file_name, event_import_file -%></td>
-    <td><%= l(event_import_file.executed_at) if event_import_file.executed_at -%></td>
-    <td><%= link_to event_import_file.user.username, event_import_file.user -%></td>
-    <td><%= event_import_file.edit_mode -%></td>
-    <td><%= localized_state(event_import_file.current_state) -%></td>
-    <td>
-      <%= link_to t('page.show'), event_import_file -%>
-      <%= link_to t('page.destroy'), event_import_file, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
-    </td>
-  </tr>
-<%- end -%>
+  <tbody>
+    <% @event_import_files.each do |event_import_file| %>
+      <tr class="line<%= cycle("0", "1") -%>">
+        <td><%= link_to (event_import_file.id), event_import_file -%></td>
+        <td>
+          <%= link_to event_import_file.event_import_file_name, event_import_file -%>
+          <br />
+          <%= t('activerecord.models.user') -%>: <%= link_to event_import_file.user.username, event_import_file.user.profile if event_import_file.user.try(:profile) -%></td>
+        <td><%= event_import_file.edit_mode -%></td>
+        <td><%= l(event_import_file.executed_at) if event_import_file.executed_at -%></td>
+        <td><%= localized_state(event_import_file.current_state) -%></td>
+        <td>
+          <%= link_to t('page.show'), event_import_file -%>
+          <%= link_to t('page.destroy'), event_import_file, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
 </table>
 
 <%= paginate(@event_import_files) -%>
@@ -35,6 +40,6 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.event_import_file')), new_event_import_file_path -%></li>
+    <li><%= link_to t('page.new', model: t('activerecord.models.event_import_file')), new_event_import_file_path -%></li>
   </ul>
 </div>

data/app/views/event_import_files/new.html.erb

@@ -1,8 +1,8 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-  <h1 class="title"><%= t('page.new', :model => t('activerecord.models.event_import_file')) -%></h1>
+  <h1 class="title"><%= t('page.new', model: t('activerecord.models.event_import_file')) -%></h1>
 <div id="content_list">
 
-<%= form_for(@event_import_file, :html => { :multipart => true }) do |f| -%>
+<%= form_for(@event_import_file, html: { multipart: true }) do |f| -%>
   <%= f.error_messages -%>
 
   <div class="field">
@@ -12,24 +12,36 @@
 
   <div class="field">
     <%= f.label :edit_mode -%><br />
-    <%= f.radio_button :edit_mode, 'create', :checked => 'checked' %>
-    <%= f.label :edit_mode, t('page.create'), :value => 'create' %>
+    <%= f.radio_button :edit_mode, 'create', checked: 'checked' %>
+    <%= f.label :edit_mode, t('page.create'), value: 'create' %>
     <%= f.radio_button :edit_mode, 'update' %>
-    <%= f.label :edit_mode, t('page.update'), :value => 'update' %>
+    <%= f.label :edit_mode, t('page.update'), value: 'update' %>
     <%= f.radio_button :edit_mode, 'destroy' %>
-    <%= f.label :edit_mode, t('page.destroy'), :value => 'destroy' %>
+    <%= f.label :edit_mode, t('page.destroy'), value: 'destroy' %>
   </div>
 
   <div class="field">
     <%= f.label :user_encoding -%><br />
-    <%= f.radio_button :user_encoding, 'auto_detect', :checked => 'checked' %>
-    <%= f.label :user_encoding, t('import.auto_detect'), :value => 'auto_detect' %>
+    <%= f.radio_button :user_encoding, 'auto_detect', checked: 'checked' %>
+    <%= f.label :user_encoding, t('import.auto_detect'), value: 'auto_detect' %>
     <%= f.radio_button :user_encoding, 'utf-8' %>
-    <%= f.label :user_encoding, 'UTF-8', :value => 'utf-8' %>
+    <%= f.label :user_encoding, 'UTF-8', value: 'utf-8' %>
     <%= f.radio_button :user_encoding, 'shift_jis' %>
-    <%= f.label :user_encoding, 'Shift_JIS', :value => 'shift_jis' %>
-    <%= f.radio_button :user_encoding, 'euc-ho' %>
-    <%= f.label :user_encoding, 'EUC-JP', :value => 'euc-jp' %>
+    <%= f.label :user_encoding, 'Shift_JIS', value: 'shift_jis' %>
+    <%= f.radio_button :user_encoding, 'euc-jp' %>
+    <%= f.label :user_encoding, 'EUC-JP', value: 'euc-jp' %>
+  </div>
+
+  <div class="field">
+    <%= f.label :default_event_category_id -%>
+    <%= f.select(:default_event_category_id, @event_categories.collect{|e| [e.display_name.localize, e.id]}) -%><br />
+    <%= t('event_import_file.default_event_category') %>
+  </div>
+
+  <div class="field">
+    <%= f.label :default_library_id -%>
+    <%= f.select(:default_library_id, @libraries.collect{|l| [l.display_name.localize, l.id]}) -%><br />
+    <%= t('event_import_file.default_library') %>
   </div>
 
   <div class="actions">

data/app/views/event_import_files/show.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.event_import_file')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.event_import_file')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
@@ -10,7 +10,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.event_import_file.event_import_file_name') -%>:</strong>
-  <%= link_to @event_import_file.event_import_file_name, event_import_file_path(@event_import_file, :format => :download) -%>
+  <%= link_to @event_import_file.event_import_file_name, event_import_file_path(@event_import_file, format: :download) -%>
 </p>
 
 <p>
@@ -48,6 +48,16 @@
   <%= @event_import_file.user_encoding -%>
 </p>
 
+<p>
+  <strong><%= t('activerecord.attributes.event_import_file.default_event_category_id') -%>:</strong>
+  <%= link_to @event_import_file.default_event_category.display_name.localize, @event_import_file.default_event_category if @event_import_file.default_event_category.try(:display_name) -%>
+</p>
+
+<p>
+  <strong><%= t('activerecord.attributes.event_import_file.default_library_id') -%>:</strong>
+  <%= link_to @event_import_file.default_library.display_name.localize, @event_import_file.default_library if @event_import_file.default_library.try(:display_name) -%>
+</p>
+
 <p>
   <strong><%= t('activerecord.attributes.event_import_file.state') -%>:</strong>
   <%= localized_state(@event_import_file.current_state) -%>
@@ -60,7 +70,7 @@
 
 <p>
   <strong><%= t('activerecord.models.user') -%>:</strong>
-  <%= link_to @event_import_file.user.username, @event_import_file.user -%>
+  <%= link_to @event_import_file.user.username, @event_import_file.user.profile if @event_import_file.user.try(:profile) -%>
 </p>
 
 </div>
@@ -69,7 +79,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <%= form_for(@event_import_file) do |f| %>
   <ul>
-    <li><%= link_to t('activerecord.models.event_import_result'), event_import_file_event_import_results_path(@event_import_file) -%></li>
+    <li><%= link_to t('activerecord.models.event_import_result'), event_import_results_path(event_import_file_id: @event_import_file.id) -%></li>
     <li><%= back_to_index(flash[:page_info]) -%></li>
     <% if current_user.has_role?('Administrator') %>
       <li><%= link_to 'Resque', resque_path %></li>

data/app/views/event_import_results/index.html.erb

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.event_import_result')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.event_import_result')) -%></h1>
 <div id="content_list">
   <% if @event_import_file %>
     <h2 class="event_title">
@@ -24,7 +24,7 @@
     <td><%= link_to event_import_result.event.display_name.localize, event_import_result.event if event_import_result.event %></td>
     <td>
       <%= link_to t('page.show'), event_import_result %>
-      <%= link_to t('page.destroy'), event_import_result, :data => {:confirm => t('page.are_you_sure')}, :method => :delete %>
+      <%= link_to t('page.destroy'), event_import_result, data: {confirm: t('page.are_you_sure')}, method: :delete %>
     </td>
   </tr>
 <% end %>
@@ -39,11 +39,11 @@
   <ul>
     <li>
     <% if @event_import_file %>
-      <%= link_to (image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'TSV', :class => 'icon'), event_import_file_event_import_results_path(@event_import_file, :format => :tsv, :locale => @locale.to_s) -%>
-      (<%= link_to 'TSV', event_import_file_event_import_results_path(:format => :tsv, :locale => @locale.to_s) -%>)
+      <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), event_import_results_path(event_import_file_id: @event_import_file.id, format: :txt, locale: @locale.to_s) -%>
+      (<%= link_to 'TSV', event_import_results_path(event_import_file_id: @event_import_file.id, format: :txt, locale: @locale.to_s) -%>)
     <% else %>
-      <%= link_to (image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'TSV', :class => 'icon'), event_import_results_path(:format => :tsv, :locale => @locale.to_s) -%>
-      (<%= link_to 'TSV', event_import_results_path(:format => :tsv, :locale => @locale.to_s) -%>)
+      <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), event_import_results_path(format: :txt, locale: @locale.to_s) -%>
+      (<%= link_to 'TSV', event_import_results_path(format: :txt, locale: @locale.to_s) -%>)
     <% end %>
     </li>
   </ul>

data/app/views/event_import_results/{index.tsv.erb → index.txt.erb}

@@ -1,3 +1,3 @@
 <%- @event_import_results.each do |event_import_result| -%>
-<%= event_import_result.body %>
+<%= event_import_result.body %><%= "\n" -%>
 <%- end -%>