Merge branch 'develop' of git.znuny.com:zammad/zammad into develop

app/models/cti/caller_id.rb

@@ -25,6 +25,9 @@ module Cti
         o_id:      data[:o_id],
         user_id:   data[:user_id],
       )
+      # p "------------------"
+      # p record
+
       return record if !record.new_record?
       record.comment = data[:comment]
       record.save!
@@ -41,11 +44,23 @@ returns
 =end
 
     def self.lookup(caller_id)
-      where(caller_id: caller_id)
+
-        .group(:user_id, :id) \
+      result = []
-        # first known, then maybe, last others
+      ['known', 'maybe', nil].each { |level|
-        .order("level != 'known', level != 'maybe', id DESC")
+
-        .limit(20)
+        search_params = {
+          caller_id: caller_id,
+        }
+
+        if level
+          search_params[:level] = level
+        end
+
+        result = Cti::CallerId.where(search_params).group(:user_id, :id).order(id: 'DESC').limit(20)
+
+        break if result.present?
+      }
+      result
     end
 
 =begin