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

Moved to use realnames.

Browse source
This commit is contained in:
Martin Edenhofer 2012-04-29 22:46:03 +02:00
parent 773392d6b3
commit 9c5ab1897b
4 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/assets/javascripts/app/controllers/_application_controller.js.coffee
View file

@ -601,8 +601,20 @@ class App.Controller extends Spine.Controller
# users # users
if params.type == 'User' if params.type == 'User'
for user of params.data for user of params.data
# set image url
if params.data[user] && !params.data[user]['image'] if params.data[user] && !params.data[user]['image']
params.data[user]['image'] = 'http://placehold.it/48x48' params.data[user]['image'] = 'http://placehold.it/48x48'
# set realname
params.data[user]['realname'] = ''
if params.data[user]['firstname']
params.data[user]['realname'] = params.data[user]['firstname']
if params.data[user]['lastname']
if params.data[user]['realname'] isnt ''
params.data[user]['realname'] = params.data[user]['realname'] + ' '
params.data[user]['realname'] = params.data[user]['realname'] + params.data[user]['lastname']
App.User.refresh( params.data[user], options: { clear: true } ) App.User.refresh( params.data[user], options: { clear: true } )
# tickets # tickets
@ -671,7 +683,6 @@ class App.Controller extends Spine.Controller
for object in params.data for object in params.data
App[params.type].refresh( object, options: { clear: true } ) App[params.type].refresh( object, options: { clear: true } )
class App.ControllerModal extends App.Controller class App.ControllerModal extends App.Controller
className: 'modal hide fade', className: 'modal hide fade',
tag: 'div', tag: 'div',

2
app/assets/javascripts/app/views/agent_ticket_view/detail.jst.eco
View file

@ -19,7 +19,7 @@
<b>State:</b> <%= ticket.ticket_state.name %> <b>State:</b> <%= ticket.ticket_state.name %>
<b>Priority:</b> <%= ticket.ticket_priority.name %> <b>Priority:</b> <%= ticket.ticket_priority.name %>
<b>Group:</b> <%= ticket.group.name %> <b>Group:</b> <%= ticket.group.name %>
<b>Owner:</b> <%= ticket.owner.firstname + ' ' + ticket.owner.lastname %> <b>Owner:</b> <%= ticket.owner.realname %>
</div> </div>
</div> </div>
<hr/> <hr/>

7
app/assets/javascripts/app/views/dashboard/activity_stream.jst.eco
View file

@ -1,10 +1,11 @@
<div class="row"> <div class="row">
<div class="span3"> <div class="span3">
<h2><%= @head %></h2> <h2><%= @head %></h2>
<ul> <dl>
<% for item in @items: %> <% for item in @items: %>
<li><span class="user-data" data-id="<%= item.created_by_id %>">"<%= item.created_by.firstname %> <%= item.created_by.lastname %>"</span> <%= item.history_type.name %> <span data-id="<%= item.o_id %>"><a data-type="edit" href="#"><%= item.history_object.name %> (<%= item.ticket.title %>)</a></span>.</li> <dt><span class="user-data" data-id="<%= item.created_by_id %>">"<%= item.created_by.realname %>"</span></dt>
<dd><%= item.history_type.name %> <span data-id="<%= item.o_id %>"><a data-type="edit" href="#"><%= item.history_object.name %> (<%= item.ticket.title %>)</a></span>.</dd>
<% end %> <% end %>
</ul> </dl>
</div> </div>
</div> </div>

2
app/assets/javascripts/app/views/user_info.jst.eco
View file

@ -4,7 +4,7 @@
<img class="thumbnail" src="<%- @user.image %>" alt=""> <img class="thumbnail" src="<%- @user.image %>" alt="">
<% end %> <% end %>
<div class="row"> <div class="row">
<div class="customer-info" title="Name"><%= @user['firstname'] %> <%= @user['lastname'] %></div> <div class="customer-info" title="Name"><%= @user['firstname'] %></div>
</div> </div>
<% for row in @data: %> <% for row in @data: %>
<% if @user[row.name]: %> <% if @user[row.name]: %>