Fixes for Rails 5.2

db/migrate/001_create_query_users.rb

@@ -1,4 +1,4 @@
-class CreateQueryUsers < ActiveRecord::Migration
+class CreateQueryUsers < ActiveRecord::Migration[4.2]
   def change
     create_table :queries_users, :id => false do |t|
       t.column :query_id, :integer, :null => false

init.rb

@@ -5,7 +5,8 @@
   require 'query_share/patches/queries_helper_patch'
 end
 
-ActionDispatch::Callbacks.to_prepare do
+#ActionDispatch::Callbacks.to_prepare do
+ActiveSupport::Reloader.to_prepare do
   require_dependency 'query_share/hooks/view_layout'
 end
 

lib/query_share/patches/issue_query_patch.rb

@@ -7,7 +7,9 @@ def self.included(base) # :nodoc:
         base.send(:include, InstanceMethods)
         base.class_eval do
           unloadable
-          alias_method_chain :visible?, :share
+          #alias_method_chain :visible?, :share
+	  alias_method :visible_without_share?, :visible?
+	  alias_method :visible?, :visible_with_share?
 
           class << self
             alias_method :visible,  :esi_visible
@@ -75,7 +77,11 @@ def principals_logins= (str_val)
           logger.debug("Redmine QueryShare : users updated #{self.query_principals.to_a}")
         end
 
-        def visible_with_share?(user=User.current)
+        def visible_without_share?(user=User.current)
+	   return true if visible?(user) == true	
+	end
+
+	def visible_with_share?(user=User.current)
           return true if visible_without_share?(user) == true
           case visibility
           when Query::VISIBILITY_GROUP

lib/query_share/patches/queries_controller_patch.rb

@@ -8,27 +8,34 @@ def self.included(base) # :nodoc:
 
         base.class_eval do
           unloadable
-          alias_method_chain :update_query_from_params, :share
+          #alias_method_chain :update_query_from_params, :share
+	  alias_method :update_query_from_params_without_share, :update_query_from_params
+	  alias_method :update_query_from_params, :update_query_from_params_with_share
         end
       end
 
       module ClassMethods
       end
 
       module InstanceMethods
+	#def upate_query_from_params_without_share
+	#  upate_query_from_params
+	#end
+
         def update_query_from_params_with_share
           update_query_from_params_without_share
-          share_visibility = params[:query] && params[:query][:visibility]
+          if @query.instance_of? IssueQuery
+            share_visibility = params[:query] && params[:query][:visibility]
 
-          if (User.current.allowed_to?(:manage_group_queries, @query.project) || User.current.admin?) &&
-           share_visibility.to_i == IssueQuery::VISIBILITY_GROUP
-            @query.query_principal_ids = params[:query] && params[:query][:principal_ids]
-            @query.principals_logins = params[:query] && params[:query][:principals_logins]
-            @query.visibility = share_visibility
-          elsif @query.visibility.to_i == IssueQuery::VISIBILITY_GROUP
-            @query.visibility = IssueQuery::VISIBILITY_PRIVATE
+            if (User.current.allowed_to?(:manage_group_queries, @query.project) || User.current.admin?) &&
+             share_visibility.to_i == IssueQuery::VISIBILITY_GROUP
+              @query.query_principal_ids = params[:query] && params[:query][:principal_ids]
+              @query.principals_logins = params[:query] && params[:query][:principals_logins]
+              @query.visibility = share_visibility
+            elsif @query.visibility.to_i == IssueQuery::VISIBILITY_GROUP
+              @query.visibility = IssueQuery::VISIBILITY_PRIVATE
+            end
           end
-
           @query
         end
       end

lib/query_share/patches/queries_helper_patch.rb

@@ -28,7 +28,13 @@ def query_links_with_share(title, queries)
                     :class => 'queries'
         ) + "\n"
   end
-  alias_method_chain :query_links, :share
+  #alias_method_chain :query_links, :share
+  alias_method :query_links_without_share, :query_links
+  alias_method :query_links, :query_links_with_share
+
+  #def query_links_without_share(title, queries)
+  #  return query_links(title, queries)
+  #end
 
   def sidebar_queries_with_share(klass, project)
     return sidebar_queries_without_share(klass, project) unless Setting.plugin_redmine_query_share['query_share_enable'] == "1"
@@ -37,5 +43,12 @@ def sidebar_queries_with_share(klass, project)
     end
     @sidebar_queries
   end
-  alias_method_chain :sidebar_queries, :share
+
+  #def sidebar_queries_without_share(klass, project)
+  #  return sidebar_queries(klass, project)
+  #end
+
+  #alias_method_chain :sidebar_queries, :share
+  alias_method :sidebar_queries_without_share, :sidebar_queries
+  alias_method :sidebar_queries, :sidebar_queries_with_share
 end