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

Fixed shown icons in ticket list for merge.

Browse source
This commit is contained in:
Martin Edenhofer 2015-09-29 23:18:50 +02:00
parent 31832897a3
commit 6f4bfc12e9
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/app/controllers/widget/ticket_list.coffee
View file

@ -20,18 +20,18 @@ class App.TicketList extends App.Controller
id: refObject.id id: refObject.id
value value
callbackIconHeader = (header) -> callbackIconHeader = (headers) ->
attribute = attribute =
name: 'icon' name: 'icon'
display: '' display: ''
translation: false translation: false
style: 'width: 28px' style: 'width: 28px'
header.unshift(0) headers.unshift(0)
header[0] = attribute headers[0] = attribute
header headers
callbackIcon = (value, object, attribute, header, refObject) -> callbackIcon = (value, object, attribute, header, refObject) ->
value = ' ' value = ' '
attribute.class = object.icon() attribute.class = object.iconClass()
attribute.link = '' attribute.link = ''
attribute.title = App.i18n.translateInline( object.iconTitle() ) attribute.title = App.i18n.translateInline( object.iconTitle() )
value value

2
app/assets/javascripts/app/models/ticket.coffee
View file

@ -43,7 +43,7 @@ class App.Ticket extends App.Model
state state
icon: -> icon: ->
"task-state" 'task-state'
iconClass: -> iconClass: ->
@getState() @getState()

2
app/assets/javascripts/app/views/generic/table.jst.eco
View file

@ -16,7 +16,7 @@
<% for item in @header: %> <% for item in @header: %>
<th<% if item.className: %> class="<%= item.className %>"<% end %><% if item.style: %> style="<%= item.style %>"<% end %>> <th<% if item.className: %> class="<%= item.className %>"<% end %><% if item.style: %> style="<%= item.style %>"<% end %>>
<%- @T( item.display ) %> <%- @T( item.display ) %>
<%- @Icon('arrow-down', 'table-sort-arrow') %> <% if item.sortOrderIcon: %><%- @Icon(item.sortOrderIcon[0], item.sortOrderIcon[1]) %><% end %>
</th> </th>
<% end %> <% end %>
<% if @destroy: %> <% if @destroy: %>