Merge branch 'develop' of github.com:martini/zammad into develop

app/models/application_model.rb

@@ -305,9 +305,9 @@ returns
 
 lookup model from cache (if exists) or retrieve it from db, id, name or login possible
 
-  result = Model.lookup( :id => 123 )
+  result = Model.lookup(id: 123)
-  result = Model.lookup( :name => 'some name' )
+  result = Model.lookup(name: 'some name')
-  result = Model.lookup( :login => 'some login' )
+  result = Model.lookup(login: 'some login')
 
 returns
 
@@ -681,10 +681,10 @@ class OwnModel < ApplicationModel
 serve methode to configure and enable search index support for this model
 
 class Model < ApplicationModel
-  search_index_support :ignore_attributes => {
+  search_index_support ignore_attributes: {
-    :create_article_type_id   => true,
+    create_article_type_id:   true,
-    :create_article_sender_id => true,
+    create_article_sender_id: true,
-    :article_count            => true,
+    article_count:            true,
   }
 
 end
@@ -748,7 +748,7 @@ reload search index with full data
 serve methode to configure and enable activity stream support for this model
 
 class Model < ApplicationModel
-  activity_stream_support :role => 'Admin'
+  activity_stream_support role: 'Admin'
 end
 
 =end
@@ -835,7 +835,7 @@ class Model < ApplicationModel
 end
 
 class Model < ApplicationModel
-  history_support :ignore_attributes => { :article_count => true }
+  history_support ignore_attributes: { article_count: true }
 end
 
 =end
@@ -1012,8 +1012,8 @@ return object and assets
 
   data = Model.full(123)
   data = {
-    :id     => 123,
+    id:     123,
-    :assets => assets,
+    assets: assets,
   }
 
 =end

app/models/application_model/search_index_base.rb

@@ -84,14 +84,6 @@ returns
 
   def search_index_attribute_lookup(attributes, ref_object)
 
-    # default keep attributes
-    keep_attributes = {}
-    if self.class.search_index_support_config[:keep_attributes]
-      self.class.search_index_support_config[:keep_attributes].each {|key, value|
-        keep_attributes[key] = value
-      }
-    end
-
     attributes_new = {}
     attributes.each {|key, value|
       next if !value

app/models/observer/ticket/notification/background_job.rb

@@ -229,11 +229,10 @@ class Observer::Ticket::Notification::BackgroundJob
   def template_create(user, ticket, article, _ticket_changes)
     article_content = ''
     if article
-      article_content = '<snip>
+      article_content = 'i18n(Information):
 <blockquote type="cite">
 #{article.body.text2html}
 </blockquote>
-&lt;/snip&gt;
 <br>
 <br>'
     end
@@ -295,11 +294,10 @@ State: i18n(#{ticket.state.name.text2html})<br>
     }
     article_content = ''
     if article
-      article_content = '&lt;snip&gt;
+      article_content = 'i18n(Information):
 <blockquote type="cite">
 #{article.body.text2html}
 </blockquote>
-&lt;/snip&gt;
 <br>
 <br>'
     end
@@ -312,7 +310,7 @@ Ticket (#{ticket.title.text2html}) wurde von "<b>#{ticket.updated_by.fullname.te
 </div>
 <br>
 <div>
-Änderungen:<br>
+i18n(Changes):<br>
 ' + changes + '
 </div>
 <br>
@@ -329,7 +327,7 @@ Ticket (#{ticket.title.text2html}) has been updated by "<b>#{ticket.updated_by.f
 </div>
 <br>
 <div>
-Changes:<br>
+i18n(Changes):<br>
 ' + changes + '
 </div>
 <br>
@@ -389,7 +387,7 @@ Changes:<br>
   def template_footer(_user, _ticket, _article)
     '
 <p>
-  <a href="#{config.http_type}://#{config.fqdn}/#ticket/zoom/#{ticket.id}">i18n(View this directly here)</a>
+  <a href="#{config.http_type}://#{config.fqdn}/#ticket/zoom/#{ticket.id}">i18n(View this in Zammad)</a>
 </p>
 <div class="footer">
   <a href="#{config.http_type}://#{config.fqdn}/#profile/notifications">i18n(Manage your notifications settings)</a>

app/models/ticket.rb

@@ -51,17 +51,7 @@ class Ticket < ApplicationModel
     article_count: true,
   }
 
-  search_index_support(
+  search_index_support
-    ignore_attributes: {
-      create_article_type_id: true,
-      create_article_sender_id: true,
-      article_count: true,
-    },
-    keep_attributes: {
-      customer_id: true,
-      organization_id: true,
-    },
-  )
 
   belongs_to    :group
   has_many      :articles,              class_name: 'Ticket::Article', after_add: :cache_update, after_remove: :cache_update