From 193ee857715fc58376b5de4c052ce75e05c09419 Mon Sep 17 00:00:00 2001
From: Henriette Dinger <h.dinger@openproject.com>
Date: Mon, 17 Feb 2020 15:32:15 +0100
Subject: [PATCH] Do not highlight empty last column in embedded tables

---
 .../src/app/components/wp-table/wp-table.directive.html   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/components/wp-table/wp-table.directive.html b/frontend/src/app/components/wp-table/wp-table.directive.html
index 2a099b835e..550ad295c0 100644
--- a/frontend/src/app/components/wp-table/wp-table.directive.html
+++ b/frontend/src/app/components/wp-table/wp-table.directive.html
@@ -4,7 +4,9 @@
       <colgroup>
         <col *ngIf="configuration.dragAndDropEnabled">
         <!-- Generate col elements dynamically(!) for each requested column plus one for the action menu's column. -->
-        <col highlight-col *ngFor="let column of [].constructor(columns.length + 1)">
+        <col highlight-col *ngFor="let column of [].constructor(columns.length)">
+        <col highlight-col *ngIf="configuration.columnMenuEnabled">
+        <col *ngIf="!configuration.columnMenuEnabled">
       </colgroup>
       <caption class="hidden-for-sighted">
         <span>{{text.tableSummary}}</span>
@@ -31,8 +33,8 @@
           </th>
           <th class="wp-table--configuration-modal--trigger wp-table--context-menu-th -short hide-when-print"
               *ngIf="configuration.columnMenuEnabled || configuration.actionsColumnEnabled">
-            <div class="generic-table--sort-header-outer">
-              <wp-table-config-menu *ngIf="configuration.columnMenuEnabled">
+            <div class="generic-table--sort-header-outer" *ngIf="configuration.columnMenuEnabled">
+              <wp-table-config-menu>
               </wp-table-config-menu>
             </div>
           </th>