From e19b80c3480f698cd2bc4969808feea3fed81573 Mon Sep 17 00:00:00 2001 From: Spacetime Date: Mon, 4 Sep 2017 21:11:56 +0800 Subject: [PATCH 01/10] Update spree_comments.gemspec --- spree_comments.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spree_comments.gemspec b/spree_comments.gemspec index b3ffab0..8762658 100644 --- a/spree_comments.gemspec +++ b/spree_comments.gemspec @@ -15,7 +15,7 @@ Gem::Specification.new do |s| s.require_path = 'lib' s.requirements << 'none' - spree_version = '~> 3.1.0.beta' + spree_version = '~> 3.3.0' s.add_dependency 'spree_api', spree_version s.add_dependency 'spree_backend', spree_version s.add_dependency 'spree_core', spree_version From ee4c03e5cfca4dedcc449e8476dc9793a0d1bd1b Mon Sep 17 00:00:00 2001 From: Spacetime Date: Mon, 4 Sep 2017 21:21:28 +0800 Subject: [PATCH 02/10] Update 20091021182639_create_comments.rb --- db/migrate/20091021182639_create_comments.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20091021182639_create_comments.rb b/db/migrate/20091021182639_create_comments.rb index f74aae9..7e1b694 100644 --- a/db/migrate/20091021182639_create_comments.rb +++ b/db/migrate/20091021182639_create_comments.rb @@ -1,4 +1,4 @@ -class CreateComments < ActiveRecord::Migration +class CreateComments < ActiveRecord::Migration[4.2] def self.up create_table :comments do |t| t.string :title, :limit => 50 From f085f5f9e0825e56913e8c63a73b65707d9d35b3 Mon Sep 17 00:00:00 2001 From: Spacetime Date: Mon, 4 Sep 2017 21:21:38 +0800 Subject: [PATCH 03/10] Update 20100406085611_create_comment_types.rb --- db/migrate/20100406085611_create_comment_types.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20100406085611_create_comment_types.rb b/db/migrate/20100406085611_create_comment_types.rb index 1a6dd0e..9b1d3ce 100644 --- a/db/migrate/20100406085611_create_comment_types.rb +++ b/db/migrate/20100406085611_create_comment_types.rb @@ -1,4 +1,4 @@ -class CreateCommentTypes < ActiveRecord::Migration +class CreateCommentTypes < ActiveRecord::Migration[4.2] def self.up create_table :comment_types do |t| t.string :name From feac0b4475bc3718db8b578c7175de1f599a5c59 Mon Sep 17 00:00:00 2001 From: Spacetime Date: Mon, 4 Sep 2017 21:21:47 +0800 Subject: [PATCH 04/10] Update 20100406100728_add_type_to_comments.rb --- db/migrate/20100406100728_add_type_to_comments.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/migrate/20100406100728_add_type_to_comments.rb b/db/migrate/20100406100728_add_type_to_comments.rb index cef3e27..3c762ea 100644 --- a/db/migrate/20100406100728_add_type_to_comments.rb +++ b/db/migrate/20100406100728_add_type_to_comments.rb @@ -1,4 +1,4 @@ -class AddTypeToComments < ActiveRecord::Migration +class AddTypeToComments < ActiveRecord::Migration[4.2] def self.up add_column :comments, :comment_type_id, :integer end @@ -6,4 +6,4 @@ def self.up def self.down remove_column :comments, :comment_type_id end -end \ No newline at end of file +end From 17d84176385e8e0d20d4e76eddd2952ac440f082 Mon Sep 17 00:00:00 2001 From: Spacetime Date: Mon, 4 Sep 2017 21:21:57 +0800 Subject: [PATCH 05/10] Update 20111123200847_prefix_tables_with_spree.rb --- db/migrate/20111123200847_prefix_tables_with_spree.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20111123200847_prefix_tables_with_spree.rb b/db/migrate/20111123200847_prefix_tables_with_spree.rb index c9bfa6e..d929b31 100644 --- a/db/migrate/20111123200847_prefix_tables_with_spree.rb +++ b/db/migrate/20111123200847_prefix_tables_with_spree.rb @@ -1,4 +1,4 @@ -class PrefixTablesWithSpree < ActiveRecord::Migration +class PrefixTablesWithSpree < ActiveRecord::Migration[4.2] def change rename_table :comments, :spree_comments rename_table :comment_types, :spree_comment_types From 9003d2c3d8032cce475997f5751ee9795cc43239 Mon Sep 17 00:00:00 2001 From: Spacetime Date: Mon, 4 Sep 2017 21:52:24 +0800 Subject: [PATCH 06/10] Update comments_controller.rb --- app/controllers/spree/admin/comments_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/spree/admin/comments_controller.rb b/app/controllers/spree/admin/comments_controller.rb index eab12ee..6021381 100644 --- a/app/controllers/spree/admin/comments_controller.rb +++ b/app/controllers/spree/admin/comments_controller.rb @@ -2,6 +2,6 @@ class Spree::Admin::CommentsController < Spree::Admin::ResourceController private def location_after_save - :back + redirect_to :back end -end \ No newline at end of file +end From 6d2f9c411696d424b5348dd79e0b08e4f0162d0c Mon Sep 17 00:00:00 2001 From: Spacetime Date: Mon, 4 Sep 2017 21:56:56 +0800 Subject: [PATCH 07/10] Update comments_controller.rb --- app/controllers/spree/admin/comments_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/spree/admin/comments_controller.rb b/app/controllers/spree/admin/comments_controller.rb index 6021381..3c2453f 100644 --- a/app/controllers/spree/admin/comments_controller.rb +++ b/app/controllers/spree/admin/comments_controller.rb @@ -2,6 +2,6 @@ class Spree::Admin::CommentsController < Spree::Admin::ResourceController private def location_after_save - redirect_to :back + redirect_back(fallback_location: root_path) end end From 8f6411816ddbb2921f6f1c1c07d59505451d72e0 Mon Sep 17 00:00:00 2001 From: Spacetime Date: Mon, 4 Sep 2017 22:00:42 +0800 Subject: [PATCH 08/10] Update comments_controller.rb --- app/controllers/spree/admin/comments_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/spree/admin/comments_controller.rb b/app/controllers/spree/admin/comments_controller.rb index 3c2453f..4533d6b 100644 --- a/app/controllers/spree/admin/comments_controller.rb +++ b/app/controllers/spree/admin/comments_controller.rb @@ -2,6 +2,6 @@ class Spree::Admin::CommentsController < Spree::Admin::ResourceController private def location_after_save - redirect_back(fallback_location: root_path) + redirect_to root_url end end From cf6111d7f06848be76cc87d61396dd8202629962 Mon Sep 17 00:00:00 2001 From: Spacetime Date: Mon, 4 Sep 2017 22:08:13 +0800 Subject: [PATCH 09/10] Update comments_controller.rb --- app/controllers/spree/admin/comments_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/spree/admin/comments_controller.rb b/app/controllers/spree/admin/comments_controller.rb index 4533d6b..5e57f95 100644 --- a/app/controllers/spree/admin/comments_controller.rb +++ b/app/controllers/spree/admin/comments_controller.rb @@ -2,6 +2,6 @@ class Spree::Admin::CommentsController < Spree::Admin::ResourceController private def location_after_save - redirect_to root_url + redirect_to (:back), :notice => "create comment" and return end end From 345c584accddc680e2bcf1c645a69dd31de1d2e0 Mon Sep 17 00:00:00 2001 From: Spacetime Date: Mon, 4 Sep 2017 22:11:38 +0800 Subject: [PATCH 10/10] Update comments_controller.rb --- app/controllers/spree/admin/comments_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/spree/admin/comments_controller.rb b/app/controllers/spree/admin/comments_controller.rb index 5e57f95..b37e66e 100644 --- a/app/controllers/spree/admin/comments_controller.rb +++ b/app/controllers/spree/admin/comments_controller.rb @@ -2,6 +2,6 @@ class Spree::Admin::CommentsController < Spree::Admin::ResourceController private def location_after_save - redirect_to (:back), :notice => "create comment" and return + request.referer end end