From 44b1b84a4103b78ffb046085eada29ef777d29a2 Mon Sep 17 00:00:00 2001
From: Alexander Meindl <alex@alphanodes.com>
Date: Thu, 31 May 2018 09:03:22 +0200
Subject: [PATCH] Prevent problem with finding data

---
 CHANGELOG.rst                              | 5 +++++
 app/helpers/additionals_queries_helper.rb  | 2 +-
 docs/conf.py                               | 4 ++--
 init.rb                                    | 2 +-
 lib/additionals/patches/issue_patch.rb     | 2 +-
 lib/additionals/wiki_macros/issue_macro.rb | 2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index d9a0bacf..ab90a743 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+2.0.12
+++++++
+
+- More robust code for dealing with finding data
+
 2.0.11
 ++++++
 
diff --git a/app/helpers/additionals_queries_helper.rb b/app/helpers/additionals_queries_helper.rb
index 12f82ef7..f5dd2299 100644
--- a/app/helpers/additionals_queries_helper.rb
+++ b/app/helpers/additionals_queries_helper.rb
@@ -31,7 +31,7 @@ module AdditionalsQueriesHelper
                         sort_criteria: params[:sort].presence || @query.sort_criteria.to_a)
     else
       # retrieve from session
-      @query = query_class.find(session["#{object_type}_query".to_sym][:id]) if session["#{object_type}_query".to_sym][:id]
+      @query = query_class.find_by(id: session["#{object_type}_query".to_sym][:id]) if session["#{object_type}_query".to_sym][:id]
       session_data = Rails.cache.read(additionals_query_cache_key(object_type))
       @query ||= query_class.new(name: '_',
                                  filters: session_data.nil? ? nil : session_data[:filters],
diff --git a/docs/conf.py b/docs/conf.py
index 8a5e2717..91306aaa 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -28,9 +28,9 @@ copyright = u'2013-2018, AlphaNodes GmbH'
 author = u'Alexander Meindl'
 
 # The short X.Y version.
-version = u'2.0.9'
+version = u'2.0.12'
 # The full version, including alpha/beta/rc tags.
-release = u'2.0.9'
+release = u'2.0.12'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
diff --git a/init.rb b/init.rb
index 9389dadf..b2d0b911 100644
--- a/init.rb
+++ b/init.rb
@@ -4,7 +4,7 @@ Redmine::Plugin.register :additionals do
   name 'Additionals'
   author 'AlphaNodes GmbH'
   description 'Customizing Redmine, providing wiki macros and act as a library/function provider for other Redmine plugins'
-  version '2.0.11'
+  version '2.0.12'
   author_url 'https://alphanodes.com/'
   url 'https://github.com/alphanodes/additionals'
 
diff --git a/lib/additionals/patches/issue_patch.rb b/lib/additionals/patches/issue_patch.rb
index 92d825ba..fb919a47 100644
--- a/lib/additionals/patches/issue_patch.rb
+++ b/lib/additionals/patches/issue_patch.rb
@@ -102,7 +102,7 @@ module Additionals
       end
 
       def auto_assigned_to_user
-        manager_role = Role.builtin.find(Additionals.settings[:issue_auto_assign_role].to_i)
+        manager_role = Role.builtin.find_by(id: Additionals.settings[:issue_auto_assign_role])
         groups = autoassign_get_group_list
         return groups[manager_role].first.id unless groups.nil? || groups[manager_role].blank?
 
diff --git a/lib/additionals/wiki_macros/issue_macro.rb b/lib/additionals/wiki_macros/issue_macro.rb
index 6f67dda0..91cdd6cf 100644
--- a/lib/additionals/wiki_macros/issue_macro.rb
+++ b/lib/additionals/wiki_macros/issue_macro.rb
@@ -42,7 +42,7 @@ module Additionals
                     comment_id = info[:comment_id] if comment_id.nil?
                     info[:issue_id])
 
-        issue = Issue.find(issue_id)
+        issue = Issue.find_by(id: issue_id)
         return 'N/A' if issue.nil? || !issue.visible?
 
         text = case options[:format]