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-10-28 10:42:25 +01:00
parent b0aa731b92 5062b4022c
commit d29fde31e5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/app/controllers/_application_controller_table.coffee
View file

@ -384,12 +384,12 @@ class App.ControllerTable extends App.Controller
getHeaderWidths: (headers) -> getHeaderWidths: (headers) ->
widths = _.reduce headers, (memo, col, i) => widths = _.reduce headers, (memo, col, i) =>
if col.style && col.width if col.width
value = parseInt col.width, 10 value = parseInt col.width, 10
unit = col.width.match(/[px|%]+/)[0] unit = col.width.match(/[px|%]+/)[0]
else else
# !!! sets the width to default width if not set # !!! sets the width to default width if not set
headers[i].style = { width: @baseColWidth+'px' } headers[i].width = @baseColWidth+'px'
value = @baseColWidth value = @baseColWidth
unit = 'px' unit = 'px'