<%- @T(value.name) %>
+ <% criteria = @config.matrix[key]?.criteria %>
+ <% channel = @config.matrix[key]?.channel %>
-
-
-
+
+
+
-
@@ -51,7 +60,7 @@
<% if @groups: %>
- * <%- @T( 'Limit Groups' ) %>
+ * <%- @T('Limit Groups') %>
diff --git a/app/assets/javascripts/app/views/ticket_zoom/sidebar_ticket.jst.eco b/app/assets/javascripts/app/views/ticket_zoom/sidebar_ticket.jst.eco
index 289917212..7349c5014 100644
--- a/app/assets/javascripts/app/views/ticket_zoom/sidebar_ticket.jst.eco
+++ b/app/assets/javascripts/app/views/ticket_zoom/sidebar_ticket.jst.eco
@@ -5,3 +5,4 @@
+
diff --git a/app/assets/javascripts/app/views/widget/mention.jst.eco b/app/assets/javascripts/app/views/widget/mention.jst.eco
new file mode 100644
index 000000000..5f3818166
--- /dev/null
+++ b/app/assets/javascripts/app/views/widget/mention.jst.eco
@@ -0,0 +1,14 @@
+<%- @T('Mentions') %>
+
+
diff --git a/app/assets/stylesheets/zammad.scss b/app/assets/stylesheets/zammad.scss
index fdb56649b..17f1aa8cb 100644
--- a/app/assets/stylesheets/zammad.scss
+++ b/app/assets/stylesheets/zammad.scss
@@ -5613,6 +5613,10 @@ footer {
cursor: help;
}
+ .notification-icon-help {
+ opacity: .2;
+ }
+
.stat-label {
color: #444a4f;
@extend .u-textTruncate;
diff --git a/app/controllers/mentions_controller.rb b/app/controllers/mentions_controller.rb
new file mode 100644
index 000000000..b5e9dddc1
--- /dev/null
+++ b/app/controllers/mentions_controller.rb
@@ -0,0 +1,100 @@
+# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/
+
+class MentionsController < ApplicationController
+ prepend_before_action -> { authorize! }
+ prepend_before_action { authentication_check }
+
+ # GET /api/v1/mentions
+ def list
+ list = Mention.where(condition).order(created_at: :desc)
+
+ if response_full?
+ assets = {}
+ item_ids = []
+ list.each do |item|
+ item_ids.push item.id
+ assets = item.assets(assets)
+ end
+ render json: {
+ record_ids: item_ids,
+ assets: assets,
+ }, status: :ok
+ return
+ end
+
+ # return result
+ render json: {
+ mentions: list,
+ }
+ end
+
+ # POST /api/v1/mentions
+ def create
+ success = Mention.create!(
+ mentionable: mentionable!,
+ user: current_user,
+ )
+ if success
+ render json: success, status: :created
+ else
+ render json: success.errors, status: :unprocessable_entity
+ end
+ end
+
+ # DELETE /api/v1/mentions
+ def destroy
+ success = Mention.find_by(user: current_user, id: params[:id]).destroy
+ if success
+ render json: success, status: :ok
+ else
+ render json: success.errors, status: :unprocessable_entity
+ end
+ end
+
+ private
+
+ def ensure_mentionable_type!
+ return if ['Ticket'].include?(params[:mentionable_type])
+
+ raise 'Invalid mentionable_type!'
+ end
+
+ def mentionable!
+ ensure_mentionable_type!
+
+ object = params[:mentionable_type].constantize.find(params[:mentionable_id])
+ authorize!(object, :update?)
+ object
+ end
+
+ def fill_condition_mentionable(condition)
+ condition[:mentionable_type] = params[:mentionable_type]
+ return if params[:mentionable_id].blank?
+
+ condition[:mentionable_id] = params[:mentionable_id]
+ end
+
+ def fill_condition_id(condition)
+ return if params[:id].blank?
+
+ condition[:id] = params[:id]
+ end
+
+ def fill_condition_user(condition)
+ return if params[:user_id].blank?
+
+ condition[:user] = User.find(params[:user_id])
+ end
+
+ def condition
+ condition = {}
+ fill_condition_id(condition)
+ fill_condition_user(condition)
+
+ return condition if params[:mentionable_type].blank?
+
+ mentionable!
+ fill_condition_mentionable(condition)
+ condition
+ end
+end
diff --git a/app/controllers/tickets_controller.rb b/app/controllers/tickets_controller.rb
index a28245ca5..5c6d2378a 100644
--- a/app/controllers/tickets_controller.rb
+++ b/app/controllers/tickets_controller.rb
@@ -163,6 +163,14 @@ class TicketsController < ApplicationController
end
end
+ # create mentions if given
+ if params[:mentions].present?
+ authorize!(Mention.new, :create?)
+ Array(params[:mentions]).each do |user_id|
+ Mention.where(mentionable: ticket, user_id: user_id).first_or_create(mentionable: ticket, user_id: user_id)
+ end
+ end
+
# create article if given
if params[:article]
article_create(ticket, params[:article])
@@ -702,6 +710,12 @@ class TicketsController < ApplicationController
# get tags
tags = ticket.tag_list
+ # get mentions
+ mentions = Mention.where(mentionable: ticket).order(created_at: :desc)
+ mentions.each do |mention|
+ assets = mention.assets(assets)
+ end
+
# return result
{
ticket_id: ticket.id,
@@ -709,6 +723,7 @@ class TicketsController < ApplicationController
assets: assets,
links: links,
tags: tags,
+ mentions: mentions.pluck(:id),
form_meta: attributes_to_change[:form_meta],
}
end
diff --git a/app/models/concerns/checks_client_notification.rb b/app/models/concerns/checks_client_notification.rb
index 79ba45e3c..85862c6bc 100644
--- a/app/models/concerns/checks_client_notification.rb
+++ b/app/models/concerns/checks_client_notification.rb
@@ -17,12 +17,19 @@ module ChecksClientNotification
{
message: {
event: "#{class_name}:#{event}",
- data: { id: id, updated_at: updated_at }
+ data: notify_clients_data_attributes
},
type: 'authenticated',
}
end
+ def notify_clients_data_attributes
+ {
+ id: id,
+ updated_at: updated_at
+ }
+ end
+
def notify_clients_send(data)
return notify_clients_send_to(data[:message]) if client_notification_send_to.present?
@@ -104,38 +111,28 @@ module ChecksClientNotification
# methods defined here are going to extend the class, not the instance of it
class_methods do
-=begin
-
-serve method to ignore events
-
-class Model < ApplicationModel
- include ChecksClientNotification
- client_notification_events_ignored :create, :update, :touch
-end
-
-=end
-
+ # serve method to ignore events
+ #
+ # @example
+ # class Model < ApplicationModel
+ # include ChecksClientNotification
+ # client_notification_events_ignored :create, :update, :touch
+ # end
def client_notification_events_ignored(*attributes)
@client_notification_events_ignored ||= []
@client_notification_events_ignored |= attributes
end
-=begin
-
-serve method to define recipient user ids
-
-class Model < ApplicationModel
- include ChecksClientNotification
- client_notification_send_to :user_id
-end
-
-=end
-
+ # serve method to define recipient user ids
+ #
+ # @example
+ # class Model < ApplicationModel
+ # include ChecksClientNotification
+ # client_notification_send_to :user_id
+ # end
def client_notification_send_to(*attributes)
@client_notification_send_to ||= []
@client_notification_send_to |= attributes
end
-
end
-
end
diff --git a/app/models/concerns/has_history.rb b/app/models/concerns/has_history.rb
index 69298e320..fcf7ac8ba 100644
--- a/app/models/concerns/has_history.rb
+++ b/app/models/concerns/has_history.rb
@@ -204,7 +204,7 @@ returns
=end
def history_get(fulldata = false)
- relation_object = self.class.instance_variable_get(:@history_relation_object) || nil
+ relation_object = history_relation_object
if !fulldata
return History.list(self.class.name, self['id'], relation_object)
@@ -213,12 +213,16 @@ returns
# get related objects
history = History.list(self.class.name, self['id'], relation_object, true)
history[:list].each do |item|
- record = item['object'].constantize.find(item['o_id'])
+ record = item['object'].constantize.lookup(id: item['o_id'])
- history[:assets] = record.assets(history[:assets])
+ if record.present?
+ history[:assets] = record.assets(history[:assets])
+ end
- if item['related_object']
- record = item['related_object'].constantize.find(item['related_o_id'])
+ next if !item['related_object']
+
+ record = item['related_object'].constantize.lookup(id: item['related_o_id'])
+ if record.present?
history[:assets] = record.assets(history[:assets])
end
end
@@ -228,6 +232,10 @@ returns
}
end
+ def history_relation_object
+ @history_relation_object ||= self.class.instance_variable_get(:@history_relation_object) || []
+ end
+
# methods defined here are going to extend the class, not the instance of it
class_methods do
=begin
@@ -256,8 +264,9 @@ end
=end
- def history_relation_object(attribute)
- @history_relation_object = attribute
+ def history_relation_object(*attributes)
+ @history_relation_object ||= []
+ @history_relation_object |= attributes
end
end
diff --git a/app/models/history.rb b/app/models/history.rb
index 68efb33e5..ee12dce15 100644
--- a/app/models/history.rb
+++ b/app/models/history.rb
@@ -124,7 +124,7 @@ returns
return all history entries of an object and it's related history objects
- history_list = History.list('Ticket', 123, true)
+ history_list = History.list('Ticket', 123, 'Ticket::Article')
returns
@@ -137,7 +137,7 @@ returns
return all history entries of an object and it's assets
- history = History.list('Ticket', 123, nil, true)
+ history = History.list('Ticket', 123, nil, ['Ticket::Article'])
returns
@@ -148,16 +148,21 @@ returns
=end
- def self.list(requested_object, requested_object_id, related_history_object = nil, assets = nil)
+ def self.list(requested_object, requested_object_id, related_history_object = [], assets = nil)
histories = History.where(
history_object_id: object_lookup(requested_object).id,
o_id: requested_object_id
)
if related_history_object.present?
+ object_ids = []
+ Array(related_history_object).each do |object|
+ object_ids << object_lookup(object).id
+ end
+
histories = histories.or(
History.where(
- history_object_id: object_lookup(related_history_object).id,
+ history_object_id: object_ids,
related_o_id: requested_object_id
)
)
diff --git a/app/models/mention.rb b/app/models/mention.rb
new file mode 100644
index 000000000..4c47fd674
--- /dev/null
+++ b/app/models/mention.rb
@@ -0,0 +1,54 @@
+# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/
+
+class Mention < ApplicationModel
+ include ChecksClientNotification
+ include HasHistory
+
+ include Mention::Assets
+
+ after_create :update_mentionable
+ after_destroy :update_mentionable
+
+ belongs_to :created_by, class_name: 'User'
+ belongs_to :updated_by, class_name: 'User'
+ belongs_to :user, class_name: 'User'
+ belongs_to :mentionable, polymorphic: true
+
+ association_attributes_ignored :created_by, :updated_by
+ client_notification_events_ignored :update, :touch
+
+ validates_with Mention::Validation
+
+ def notify_clients_data_attributes
+ super.merge(
+ 'mentionable_id' => mentionable_id,
+ 'mentionable_type' => mentionable_type,
+ )
+ end
+
+ def history_log_attributes
+ {
+ related_o_id: mentionable_id,
+ related_history_object: mentionable_type,
+ }
+ end
+
+ def history_destroy
+ history_log('removed', created_by_id)
+ end
+
+ def self.duplicates(mentionable1, mentionable2)
+ Mention.joins(', mentions as mentionsb').where('
+ mentions.user_id = mentionsb.user_id
+ AND mentions.mentionable_type = ?
+ AND mentions.mentionable_id = ?
+ AND mentionsb.mentionable_type = ?
+ AND mentionsb.mentionable_id = ?
+ ', mentionable1.class.to_s, mentionable1.id, mentionable2.class.to_s, mentionable2.id)
+ end
+
+ def update_mentionable
+ mentionable.update(updated_by: updated_by)
+ mentionable.touch # rubocop:disable Rails/SkipsModelValidations
+ end
+end
diff --git a/app/models/mention/assets.rb b/app/models/mention/assets.rb
new file mode 100644
index 000000000..7d9993fba
--- /dev/null
+++ b/app/models/mention/assets.rb
@@ -0,0 +1,28 @@
+# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/
+
+class Mention
+ module Assets
+ extend ActiveSupport::Concern
+
+ def assets_attributes(data)
+ app_model = self.class.to_app_model
+
+ data[ app_model ] ||= {}
+ return data if data[ app_model ][ id ]
+
+ data[ app_model ][ id ] = attributes_with_association_ids
+
+ data
+ end
+
+ def assets(data)
+ assets_attributes(data)
+
+ if mentionable.present?
+ data = mentionable.assets(data)
+ end
+
+ user.assets(data)
+ end
+ end
+end
diff --git a/app/models/mention/validation.rb b/app/models/mention/validation.rb
new file mode 100644
index 000000000..3444fbcf5
--- /dev/null
+++ b/app/models/mention/validation.rb
@@ -0,0 +1,21 @@
+# Copyright (C) 2012-2016 Zammad Foundation, http://zammad-foundation.org/
+class Mention::Validation < ActiveModel::Validator
+ attr_reader :record
+
+ def validate(record)
+ @record = record
+ check_user_permission
+ end
+
+ private
+
+ def check_user_permission
+ return if MentionPolicy.new(record.user, record).create?
+
+ invalid_because(:user, 'has no ticket.agent permissions')
+ end
+
+ def invalid_because(attribute, message)
+ record.errors.add attribute, message
+ end
+end
diff --git a/app/models/ticket.rb b/app/models/ticket.rb
index 2e5727e54..006e97895 100644
--- a/app/models/ticket.rb
+++ b/app/models/ticket.rb
@@ -66,7 +66,7 @@ class Ticket < ApplicationModel
:article_count,
:preferences
- history_relation_object 'Ticket::Article'
+ history_relation_object 'Ticket::Article', 'Mention'
sanitized_html :note
@@ -75,6 +75,7 @@ class Ticket < ApplicationModel
has_many :articles, class_name: 'Ticket::Article', after_add: :cache_update, after_remove: :cache_update, dependent: :destroy, inverse_of: :ticket
has_many :ticket_time_accounting, class_name: 'Ticket::TimeAccounting', dependent: :destroy, inverse_of: :ticket
has_many :flags, class_name: 'Ticket::Flag', dependent: :destroy
+ has_many :mentions, as: :mentionable, dependent: :destroy
belongs_to :state, class_name: 'Ticket::State', optional: true
belongs_to :priority, class_name: 'Ticket::Priority', optional: true
belongs_to :owner, class_name: 'User', optional: true
@@ -84,7 +85,7 @@ class Ticket < ApplicationModel
belongs_to :create_article_type, class_name: 'Ticket::Article::Type', optional: true
belongs_to :create_article_sender, class_name: 'Ticket::Article::Sender', optional: true
- association_attributes_ignored :flags
+ association_attributes_ignored :flags, :mentions
self.inheritance_column = nil
@@ -364,6 +365,10 @@ returns
updated_by_id: data[:user_id],
)
+ # search for mention duplicates and destroy them before moving mentions
+ Mention.duplicates(self, target_ticket).destroy_all
+ Mention.where(mentionable: self).update_all(mentionable_id: target_ticket.id) # rubocop:disable Rails/SkipsModelValidations
+
# reassign links to the new ticket
# rubocop:disable Rails/SkipsModelValidations
ticket_source_id = Link::Object.find_by(name: 'Ticket').id
@@ -574,17 +579,19 @@ condition example
# get tables to join
tables = ''
- selectors.each_key do |attribute|
- selector = attribute.split('.')
- next if !selector[1]
- next if selector[0] == 'ticket'
- next if selector[0] == 'execution_time'
- next if tables.include?(selector[0])
+ selectors.each do |attribute, selector_raw|
+ attributes = attribute.split('.')
+ selector = selector_raw.stringify_keys
+ next if !attributes[1]
+ next if attributes[0] == 'execution_time'
+ next if tables.include?(attributes[0])
+ next if attributes[0] == 'ticket' && attributes[1] != 'mention_user_ids'
+ next if attributes[0] == 'ticket' && attributes[1] == 'mention_user_ids' && selector['pre_condition'] == 'not_set'
if query != ''
query += ' AND '
end
- case selector[0]
+ case attributes[0]
when 'customer'
tables += ', users customers'
query += 'tickets.customer_id = customers.id'
@@ -600,8 +607,13 @@ condition example
when 'ticket_state'
tables += ', ticket_states'
query += 'tickets.state_id = ticket_states.id'
+ when 'ticket'
+ if attributes[1] == 'mention_user_ids'
+ tables += ', mentions'
+ query += "tickets.id = mentions.mentionable_id AND mentions.mentionable_type = 'Ticket'"
+ end
else
- raise "invalid selector #{attribute.inspect}->#{selector.inspect}"
+ raise "invalid selector #{attribute.inspect}->#{attributes.inspect}"
end
end
@@ -662,6 +674,29 @@ condition example
query += ' AND '
end
+ # because of no grouping support we select not_set by sub select for mentions
+ if attributes[0] == 'ticket' && attributes[1] == 'mention_user_ids'
+ if selector['pre_condition'] == 'not_set'
+ query += if selector['operator'] == 'is'
+ "(SELECT 1 FROM mentions mentions_sub WHERE mentions_sub.mentionable_type = 'Ticket' AND mentions_sub.mentionable_id = tickets.id) IS NULL"
+ else
+ "1 = (SELECT 1 FROM mentions mentions_sub WHERE mentions_sub.mentionable_type = 'Ticket' AND mentions_sub.mentionable_id = tickets.id)"
+ end
+ else
+ query += if selector['operator'] == 'is'
+ 'mentions.user_id IN (?)'
+ else
+ 'mentions.user_id NOT IN (?)'
+ end
+ if selector['pre_condition'] == 'current_user.id'
+ bind_params.push current_user_id
+ else
+ bind_params.push selector['value']
+ end
+ end
+ next
+ end
+
if selector['operator'] == 'is'
if selector['pre_condition'] == 'not_set'
if attributes[1].match?(/^(created_by|updated_by|owner|customer|user)_id/)
diff --git a/app/models/ticket/article.rb b/app/models/ticket/article.rb
index 8afcc1c99..2d75686fb 100644
--- a/app/models/ticket/article.rb
+++ b/app/models/ticket/article.rb
@@ -31,7 +31,8 @@ class Ticket::Article < ApplicationModel
belongs_to :updated_by, class_name: 'User', optional: true
belongs_to :origin_by, class_name: 'User', optional: true
- before_save :touch_ticket_if_needed
+ before_validation :check_mentions, on: :create
+ before_save :touch_ticket_if_needed
before_create :check_subject, :check_body, :check_message_id_md5
before_update :check_subject, :check_body, :check_message_id_md5
after_destroy :store_delete, :update_time_units
@@ -323,6 +324,26 @@ returns
self.body = body[0, limit]
end
+ def check_mentions
+ begin
+ mention_user_ids = Nokogiri::HTML(body).css('a[data-mention-user-id]').map do |link|
+ link['data-mention-user-id']
+ end
+ rescue => e
+ Rails.logger.error "Can't parse body '#{body}' as HTML for extracting Mentions."
+ Rails.logger.error e
+ return
+ end
+
+ return if mention_user_ids.blank?
+ raise "User #{updated_by_id} has no permission to mention other Users!" if !MentionPolicy.new(updated_by, Mention.new).create?
+
+ user_ids = User.where(id: mention_user_ids).pluck(:id)
+ user_ids.each do |user_id|
+ Mention.where(mentionable: ticket, user_id: user_id).first_or_create(mentionable: ticket, user_id: user_id)
+ end
+ end
+
def history_log_attributes
{
related_o_id: self['ticket_id'],
diff --git a/app/models/ticket/search_index.rb b/app/models/ticket/search_index.rb
index 9aa0b0055..6aad0166a 100644
--- a/app/models/ticket/search_index.rb
+++ b/app/models/ticket/search_index.rb
@@ -8,10 +8,10 @@ module Ticket::SearchIndex
# collect article data
# add tags
- tags = tag_list
- if tags.present?
- attributes[:tags] = tags
- end
+ attributes['tags'] = tag_list
+
+ # mentions
+ attributes['mention_user_ids'] = mentions.pluck(:user_id)
# current payload size
total_size_current = 0
diff --git a/app/models/transaction/notification.rb b/app/models/transaction/notification.rb
index 4b4a813cb..8faba6ff7 100644
--- a/app/models/transaction/notification.rb
+++ b/app/models/transaction/notification.rb
@@ -50,9 +50,22 @@ class Transaction::Notification
recipients_and_channels = []
recipients_reason = {}
- # loop through all users
+ # loop through all group users
possible_recipients = possible_recipients_of_group(ticket.group_id)
+ # loop through all mention users
+ mention_users = Mention.where(mentionable_type: @item[:object], mentionable_id: @item[:object_id]).map(&:user)
+ if mention_users.present?
+
+ # only notify if read permission on group are given
+ mention_users.each do |mention_user|
+ next if !mention_user.group_access?(ticket.group_id, 'read')
+
+ possible_recipients.push mention_user
+ recipients_reason[mention_user.id] = 'are mentioned'
+ end
+ end
+
# apply owner
if ticket.owner_id != 1
possible_recipients.push ticket.owner
diff --git a/app/models/user.rb b/app/models/user.rb
index 865352202..8eb1421e0 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -34,6 +34,7 @@ class User < ApplicationModel
has_one :chat_agent_updated_by, class_name: 'Chat::Agent', foreign_key: :updated_by_id, dependent: :destroy, inverse_of: :updated_by
has_many :chat_sessions, class_name: 'Chat::Session', dependent: :destroy
has_many :karma_user, class_name: 'Karma::User', dependent: :destroy
+ has_many :mentions, dependent: :destroy
has_many :karma_activity_logs, class_name: 'Karma::ActivityLog', dependent: :destroy
has_many :cti_caller_ids, class_name: 'Cti::CallerId', dependent: :destroy
has_many :customer_tickets, class_name: 'Ticket', foreign_key: :customer_id, dependent: :destroy, inverse_of: :customer
@@ -54,7 +55,7 @@ class User < ApplicationModel
store :preferences
- association_attributes_ignored :online_notifications, :templates, :taskbars, :user_devices, :chat_sessions, :karma_activity_logs, :cti_caller_ids, :text_modules, :customer_tickets, :owner_tickets, :created_recent_views, :chat_agents, :data_privacy_tasks, :overviews
+ association_attributes_ignored :online_notifications, :templates, :taskbars, :user_devices, :chat_sessions, :karma_activity_logs, :cti_caller_ids, :text_modules, :customer_tickets, :owner_tickets, :created_recent_views, :chat_agents, :data_privacy_tasks, :overviews, :mentions
activity_stream_permission 'admin.user'
diff --git a/app/policies/controllers/mentions_controller_policy.rb b/app/policies/controllers/mentions_controller_policy.rb
new file mode 100644
index 000000000..857b86fae
--- /dev/null
+++ b/app/policies/controllers/mentions_controller_policy.rb
@@ -0,0 +1,3 @@
+class Controllers::MentionsControllerPolicy < Controllers::ApplicationControllerPolicy
+ default_permit!('ticket.agent')
+end
diff --git a/app/policies/mention_policy.rb b/app/policies/mention_policy.rb
new file mode 100644
index 000000000..6a3d00da8
--- /dev/null
+++ b/app/policies/mention_policy.rb
@@ -0,0 +1,5 @@
+class MentionPolicy < ApplicationPolicy
+ def create?
+ user.permissions?('ticket.agent')
+ end
+end
diff --git a/app/views/mailer/ticket_update/cs.html.erb b/app/views/mailer/ticket_update/cs.html.erb
index e5e41198b..e9341a135 100644
--- a/app/views/mailer/ticket_update/cs.html.erb
+++ b/app/views/mailer/ticket_update/cs.html.erb
@@ -25,5 +25,5 @@ Ticket (#{ticket.title}) byl aktualizován uživatelem "#{current_user.longna
<% end %>
#{current_user.longname} " aktualisier
<% end %>
#{current_user.longname} ".
<% end %>
#{current_user.longname}
#{current_user.longname}
<% end %>
#{current_user.longname}<
<% end %>
#{current_user.longname} "
<% end %>
agent ",
+ }
+ }
+ authenticated_as(agent)
+ post '/api/v1/tickets', params: params, as: :json
+ expect(response).to have_http_status(:created)
+ expect(Mention.where(mentionable: Ticket.last).count).to eq(1)
+ end
+
+ it 'does not ticket create with mentions when customer' do
+ params = {
+ title: 'a new ticket #1',
+ group: 'Users',
+ customer_id: customer.id,
+ article: {
+ body: "some body agent ",
+ }
+ }
+ authenticated_as(customer)
+ post '/api/v1/tickets', params: params, as: :json
+ expect(response).to have_http_status(:internal_server_error)
+ expect(Mention.count).to eq(0)
+ end
end
describe 'DELETE /api/v1/ticket_articles/:id', authenticated_as: -> { user } do
diff --git a/spec/requests/ticket_spec.rb b/spec/requests/ticket_spec.rb
index 184c0f8cd..2bc4b1ba6 100644
--- a/spec/requests/ticket_spec.rb
+++ b/spec/requests/ticket_spec.rb
@@ -2200,6 +2200,47 @@ RSpec.describe 'Ticket', type: :request do
end
+ describe 'mentions' do
+ let(:user1) { create(:agent, groups: [ticket_group]) }
+ let(:user2) { create(:agent, groups: [ticket_group]) }
+ let(:user3) { create(:agent, groups: [ticket_group]) }
+
+ def new_ticket_with_mentions
+ params = {
+ title: 'a new ticket #11',
+ group: ticket_group.name,
+ customer: {
+ firstname: 'some firstname',
+ lastname: 'some lastname',
+ email: 'some_new_customer@example.com',
+ },
+ article: {
+ body: 'some test 123',
+ },
+ mentions: [user1.id, user2.id, user3.id]
+ }
+ authenticated_as(agent)
+ post '/api/v1/tickets', params: params, as: :json
+ expect(response).to have_http_status(:created)
+
+ json_response
+ end
+
+ it 'create ticket with mentions' do
+ new_ticket_with_mentions
+ expect(Mention.all.count).to eq(3)
+ end
+
+ it 'check ticket get' do
+ ticket = new_ticket_with_mentions
+
+ get "/api/v1/tickets/#{ticket['id']}?all=true", params: {}, as: :json
+ expect(response).to have_http_status(:ok)
+ expect(json_response['mentions'].count).to eq(3)
+ expect(json_response['assets']['Mention'].count).to eq(3)
+ end
+ end
+
describe 'stats' do
let(:ticket1) { create(:ticket, customer: customer, organization: organization, group: ticket_group) }
let(:ticket2) { create(:ticket, customer: customer, organization: organization, group: ticket_group) }
diff --git a/spec/system/ticket/zoom_spec.rb b/spec/system/ticket/zoom_spec.rb
index 62f9874a7..634e37553 100644
--- a/spec/system/ticket/zoom_spec.rb
+++ b/spec/system/ticket/zoom_spec.rb
@@ -1277,6 +1277,36 @@ RSpec.describe 'Ticket zoom', type: :system do
end
end
+ describe 'mentions' do
+ context 'when logged in as agent' do
+ let(:ticket) { create(:ticket, group: Group.find_by(name: 'Users')) }
+ let!(:other_agent) { create(:agent, groups: [Group.find_by(name: 'Users')]) }
+
+ it 'can subscribe and unsubscribe' do
+ ensure_websocket do
+ visit "ticket/zoom/#{ticket.id}"
+
+ click '.mentions .js-subscribe input'
+ expect(page).to have_selector('.mentions .js-unsubscribe input', wait: 10)
+ expect(page).to have_selector('.mentions span.avatar', wait: 10)
+
+ click '.mentions .js-unsubscribe input'
+ expect(page).to have_selector('.mentions .js-subscribe input', wait: 10)
+ expect(page).to have_no_selector('.mentions span.avatar', wait: 10)
+
+ create(:mention, mentionable: ticket, user: other_agent)
+ expect(page).to have_selector('.mentions span.avatar', wait: 10)
+
+ # check history for mention entries
+ click 'h2.sidebar-header-headline.js-headline'
+ click 'li[data-type=ticket-history] a'
+ expect(page).to have_text('created Mention', wait: 10)
+ expect(page).to have_text('removed Mention', wait: 10)
+ end
+ end
+ end
+ end
+
# https://github.com/zammad/zammad/issues/2671
describe 'Pending time field in ticket sidebar', authenticated_as: :customer do
let(:customer) { create(:customer) }