enju_event 0.0.18 → 0.0.19

data/app/controllers/participates_controller.rb

@@ -60,7 +60,7 @@ class ParticipatesController < ApplicationController
       if @participate.update_attributes(params[:participate])
         flash[:notice] = 'Participate was successfully updated.'
         format.html { redirect_to(@participate) }
-        format.json { head :ok }
+        format.json { head :no_content }
       else
         format.html { render :action => "edit" }
         format.json { render :json => @participate.errors, :status => :unprocessable_entity }
@@ -74,8 +74,8 @@ class ParticipatesController < ApplicationController
     @participate.destroy
 
     respond_to do |format|
-      format.html { redirect_to(participates_url) }
-      format.json { head :ok }
+      format.html { redirect_to participates_url }
+      format.json { head :no_content }
     end
   end
 end

data/app/models/event.rb

@@ -8,7 +8,6 @@ class Event < ActiveRecord::Base
 
   belongs_to :event_category, :validate => true
   belongs_to :library, :validate => true
-  has_many :attachment_files, :as => :attachable
   has_many :picture_files, :as => :picture_attachable
   has_many :participates, :dependent => :destroy
   has_many :patrons, :through => :participates

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

@@ -18,17 +18,17 @@
 <p>
   <%- case params[:mode]
       when 'upcoming' -%>
-    <%= link_to t('event.all'), params.merge(:mode => nil) -%>
+    <%= link_to t('event.all'), url_for(params.merge(:mode => nil, :only_path => true)) -%>
     <strong><%= t('event.upcoming') -%></strong>
-    <%= link_to t('event.past'), params.merge(:mode => 'past') -%>
+    <%= link_to t('event.past'), url_for(params.merge(:mode => 'past', :only_path => true)) -%>
   <%- when 'past' -%>
-    <%= link_to t('event.all'), params.merge(:mode => nil) -%>
-    <%= link_to t('event.upcoming'), params.merge(:mode => 'upcoming') -%>
+    <%= link_to t('event.all'), url_for(params.merge(:mode => nil, :only_path => true)) -%>
+    <%= link_to t('event.upcoming'), url_for(params.merge(:mode => 'upcoming', :only_path => true)) -%>
     <strong><%= t('event.past') -%></strong>
   <%- else -%>
     <strong><%= t('event.all') -%></strong>
-    <%= link_to t('event.upcoming'), params.merge(:mode => 'upcoming') -%>
-    <%= link_to t('event.past'), params.merge(:mode => 'past') -%>
+    <%= link_to t('event.upcoming'), url_for(params.merge(:mode => 'upcoming', :only_path => true)) -%>
+    <%= link_to t('event.past'), url_for(params.merge(:mode => 'past', :only_path => true)) -%>
   <%- end -%>
 </p>
 

data/app/views/events/index.mobile.erb

@@ -21,17 +21,17 @@
 <p>
   <%- case params[:mode]
       when 'upcoming' -%>
-    <%= link_to t('event.all'), params.merge(:mode => nil) -%>
+    <%= link_to t('event.all'), url_for(params.merge(:mode => nil, :only_path => true)) -%>
     <strong><%= t('event.upcoming') -%></strong>
-    <%= link_to t('event.past'), params.merge(:mode => 'past') -%>
+    <%= link_to t('event.past'), url_for(params.merge(:mode => 'past', :only_path => true)) -%>
   <%- when 'past' -%>
-    <%= link_to t('event.all'), params.merge(:mode => nil) -%>
-    <%= link_to t('event.upcoming'), params.merge(:mode => 'upcoming') -%>
+    <%= link_to t('event.all'), url_for(params.merge(:mode => nil, :only_path => true)) -%>
+    <%= link_to t('event.upcoming'), url_for(params.merge(:mode => 'upcoming', :only_path => true)) -%>
     <strong><%= t('event.past') -%></strong>
   <%- else -%>
     <strong><%= t('event.all') -%></strong>
-    <%= link_to t('event.upcoming'), params.merge(:mode => 'upcoming') -%>
-    <%= link_to t('event.past'), params.merge(:mode => 'past') -%>
+    <%= link_to t('event.upcoming'), url_for(params.merge(:mode => 'upcoming', :only_path => true)) -%>
+    <%= link_to t('event.past'), url_for(params.merge(:mode => 'past', :only_path => true)) -%>
   <%- end -%>
 </p>
 </div>

data/app/views/events/index.rss.builder

@@ -4,11 +4,11 @@ xml.rss('version' => "2.0",
   'xmlns:atom' => "http://www.w3.org/2005/Atom"){
   xml.channel{
     xml.title t('event.library_group_event', :library_group_name => @library_group.display_name.localize)
-    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(:format => nil))}"
+    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(:format => nil, :only_path => true))}"
     xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
     xml.language @locale.to_s
     xml.ttl "60"
-    xml.tag! "atom:link", :rel => 'self', :href => "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(:format => :rss))}"
+    xml.tag! "atom:link", :rel => 'self', :href => "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(:format => :rss, :only_path => true))}"
     xml.tag! "atom:link", :rel => 'alternate', :href => events_url
     #xml.tag! "atom:link", :rel => 'search', :type => 'application/opensearchdescription+xml', :href => "http://#{request.host_with_port}/page/opensearch"
     unless params[:query].blank?

data/lib/enju_event/version.rb

@@ -1,3 +1,3 @@
 module EnjuEvent
-  VERSION = "0.0.18"
+  VERSION = "0.0.19"
 end

data/spec/dummy/config/initializers/devise.rb

@@ -92,10 +92,6 @@ Devise.setup do |config|
   # If true, extends the user's remember period when remembered via cookie.
   # config.extend_remember_period = false
 
-  # If true, uses the password salt as remember token. This should be turned
-  # to false if you are not using database authenticatable.
-  config.use_salt_as_remember_token = true
-
   # Options to be passed to the created cookie. For instance, you can set
   # :secure => true in order to force SSL only cookies.
   # config.cookie_options = {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_event
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-14 00:00:00.000000000 Z
+date: 2012-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -477,7 +477,6 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/001_create_patrons.rb
 - spec/dummy/db/migrate/059_create_libraries.rb
 - spec/dummy/db/migrate/069_create_shelves.rb
@@ -504,8 +503,6 @@ files:
 - spec/dummy/lib/enju_leaf/master_model.rb
 - spec/dummy/lib/enju_leaf/url_validator.rb
 - spec/dummy/lib/enju_leaf.rb
-- spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample1.tsv
-- spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample2.tsv
 - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_destroy_file.tsv
 - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample1.tsv
 - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample2.tsv
@@ -636,7 +633,6 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
-- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/001_create_patrons.rb
 - spec/dummy/db/migrate/059_create_libraries.rb
 - spec/dummy/db/migrate/069_create_shelves.rb
@@ -663,8 +659,6 @@ test_files:
 - spec/dummy/lib/enju_leaf/master_model.rb
 - spec/dummy/lib/enju_leaf/url_validator.rb
 - spec/dummy/lib/enju_leaf.rb
-- spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample1.tsv
-- spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample2.tsv
 - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_destroy_file.tsv
 - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample1.tsv
 - spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample2.tsv

data/spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample1.tsv

@@ -1,5 +0,0 @@
-"name"	"category"	"library_shortname"	"start_at"	"end_at"	"dummy"
-"イベント名"	"カテゴリ。休館日の場合はclosed"	"図書館名"	"開始日"	"終了日"	"インポート省略"
-"hogehoge"	"おはなし会"	"kamata"	"2009-04-01"	"2009-04-03"	
-"hogehoge"		"hachioji"			
-"休館日"	"closed"	"kamata"	"2011-04-01"	"2011-04-03"	

data/spec/dummy/private/system/event_import_files/event_imports/000/000/001/original/event_import_file_sample2.tsv

@@ -1,3 +0,0 @@
-"name"	"library_shortname"	"start_at"	"end_at"
-"���{��̍Â���"	"kamata"	"2011-03-26"	"2011-03-27"
-"���{��̍Â���2"	"kamata"	"2011-03-26"	"2011-03-27"