Merge branch 'develop'

* develop:
  better regexp for ticket numbers / prevent indexing of empty records
  remove rsolr

Author: KieranHayes

app/controllers/redsun_search_controller.rb

@@ -5,12 +5,13 @@ class RedsunSearchController < ApplicationController
   before_action :find_optional_project
   before_action :set_search_form
 
+
   def index
     searchstring = params[:search_form][:searchstring] || ''
 
     # Redirect to Issue if ticket ID is entered
-    if searchstring.match(/^#?(\d+)$/) && Issue.visible.find_by_id($1.to_i)
-      redirect_to controller: 'issues', action: 'show', id: $1
+    if searchstring.match(/^\s*[#]?(\d+).*$/) && Issue.visible.find_by_id($1.to_i)
+      redirect_to controller: 'issues', action: 'show', id: $1.to_i
       return
     end
 

init.rb

@@ -4,7 +4,7 @@
   name 'Redmine Redsun Plugin'
   author 'Kieran Hayes'
   description 'This plugin utilizes the sunspot gem for search'
-  version '2.1.0'
+  version '2.1.1'
   url 'http://www.dkd.de'
   author_url 'https://www.dkd.de'
 

lib/redmine_redsun/journal_patch.rb

@@ -61,7 +61,9 @@ module ClassMethods
     module InstanceMethods
 
       def indice_for_sunspot
-        journalized.journals.map(&:id).index(self.id)+1 if journalized.try(:journals)
+        if journalized.try(:journals) && journalized.journals.any?
+          journalized.journals.map(&:id).index(self.id)+1
+        end
       end
 
       def class_name