Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Martin Edenhofer 2015-11-13 17:04:20 +01:00
commit 4df599b28a
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/chat.coffee
View file

@ -215,7 +215,7 @@ class chatWindow extends App.Controller
(data) => (data) =>
return if data.session_id isnt @session.session_id return if data.session_id isnt @session.session_id
return if data.self_written return if data.self_written
@addStatusMessage("#{data.realname} was leaving the conversation") @addStatusMessage("<strong>#{data.realname}</strong> has left the conversation")
@goOffline() @goOffline()
) )

2
app/assets/stylesheets/zammad.scss
View file

@ -7255,7 +7255,7 @@ output {
} }
.chat-message--customer.chat-message--new { .chat-message--customer.chat-message--new {
font-weight: 500; font-weight: bold;
} }
.chat-message--agent { .chat-message--agent {

2
lib/sessions/event/chat_session_close.rb
View file

@ -21,7 +21,7 @@ class Sessions::Event::ChatSessionClose < Sessions::Event::ChatBase
} }
end end
realname = 'anonymous' realname = 'Anonymous'
if @session && @session['id'] if @session && @session['id']
realname = User.find(@session['id']).fullname realname = User.find(@session['id']).fullname
end end