Merge pull request #1881 from opf/fix/colspan_on_work_package_list

Fix colspan on work package list
pull/1887/head
Alex Coles 10 years ago
commit 6e3075249c
  1. 7
      public/templates/work_packages/work_packages_table.html

@ -54,7 +54,7 @@
keyboard_hover: true keyboard_hover: true
}" }"
id="group-header-{{ row.groupName }}"> id="group-header-{{ row.groupName }}">
<td colspan="{{ columns.length + 3 - (!!hideWorkPackageDetails * 1) }}"> <td colspan="{{ columns.length + 2 - (!!hideWorkPackageDetails * 1) }}">
<span ng-class="[ <span ng-class="[
'expander', 'expander',
'icon-context', 'icon-context',
@ -146,10 +146,11 @@
'group-sum', 'group-sum',
'sum', 'sum',
'grouped', 'grouped',
'group',
'issue', 'issue',
'work_package' 'work_package'
]"> ]">
<td colspan="{{3 - (!!hideWorkPackageDetails * 1)}}"> <td colspan="{{2 - (!!hideWorkPackageDetails * 1)}}">
{{ I18n.t('js.label_sum_for') }} {{ I18n.t('js.label_sum_for') }}
<span work-package-column <span work-package-column
work-package="row.object" work-package="row.object"
@ -167,7 +168,7 @@
ng-if="displaySums" ng-if="displaySums"
cg-busy="fetchTotalSums" cg-busy="fetchTotalSums"
class="sum group all issue work_package"> class="sum group all issue work_package">
<td colspan="{{3 - (!!hideWorkPackageDetails * 1)}}">{{ I18n.t('js.label_sum_for') }} {{ I18n.t('js.label_all_work_packages') }}</td> <td colspan="{{2 - (!!hideWorkPackageDetails * 1)}}">{{ I18n.t('js.label_sum_for') }} {{ I18n.t('js.label_all_work_packages') }}</td>
<td ng-repeat="column in columns"> <td ng-repeat="column in columns">
{{ column.total_sum }} {{ column.total_sum }}
</td> </td>

Loading…
Cancel
Save