Skip to content

Commit

Permalink
TP: Fixes missing ecs enabled property on a number of ds tables (#4400)
Browse files Browse the repository at this point in the history 
* fixes missing ecs enabled value in a handful of ds tables

* fixes incorrect table id reference
  • Loading branch information
@mitchell852
mitchell852 committed Feb 18, 2020
1 parent 18fe13a commit 89ab66e
Show file tree
Hide file tree
Showing 7 changed files with 20 additions and 8 deletions.
4 changes: 3 additions & 1 deletion ...ortal/app/src/common/modules/table/cdnDeliveryServices/table.cdnDeliveryServices.tpl.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
<th>DNS Bypass TTL</th>
<th>DNS TTL</th>
<th>DSCP</th>
<th>ECS Enabled</th>
<th>Edge Header Rewrite Rules</th>
<th>FQ Pacing Rate</th>
<th>Geo Limit</th>
Expand Down Expand Up @@ -119,6 +120,7 @@
<td data-search="^{{::ds.dnsBypassTtl}}$">{{::ds.dnsBypassTtl}}</td>
<td data-search="^{{::ds.ccrDnsTtl}}$">{{::ds.ccrDnsTtl}}</td>
<td data-search="^{{::ds.dscp}}$">{{::ds.dscp}}</td>
<td data-search="^{{::ds.ecsEnabled}}$">{{::ds.ecsEnabled}}</td>
<td data-search="^{{::ds.edgeHeaderRewrite}}$">{{::ds.edgeHeaderRewrite}}</td>
<td data-search="^{{::ds.fqPacingRate}}$">{{::ds.fqPacingRate}}</td>
<td data-search="^{{::geoLimit(ds)}}$">{{::geoLimit(ds)}}</td>
Expand Down Expand Up @@ -158,7 +160,7 @@
<td data-search="^{{::ds.trResponseHeaders}}$">{{::ds.trResponseHeaders}}</td>
<td data-search="^{{::ds.trRequestHeaders}}$">{{::ds.trRequestHeaders}}</td>
<td data-search="^{{::ds.type}}$">{{::ds.type}}</td>
<td data-search="^{{::ds.xmlId}}$">{{::ds.xmlId}}</td>
<td name="xmlId" data-search="^{{::ds.xmlId}}$">{{::ds.xmlId}}</td>
</tr>
</tbody>
</table>
Expand Down
4 changes: 3 additions & 1 deletion ...p/src/common/modules/table/profileDeliveryServices/table.profileDeliveryServices.tpl.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
<th>DNS Bypass TTL</th>
<th>DNS TTL</th>
<th>DSCP</th>
<th>ECS Enabled</th>
<th>Edge Header Rewrite Rules</th>
<th>FQ Pacing Rate</th>
<th>Geo Limit</th>
Expand Down Expand Up @@ -119,6 +120,7 @@
<td data-search="^{{::ds.dnsBypassTtl}}$">{{::ds.dnsBypassTtl}}</td>
<td data-search="^{{::ds.ccrDnsTtl}}$">{{::ds.ccrDnsTtl}}</td>
<td data-search="^{{::ds.dscp}}$">{{::ds.dscp}}</td>
<td data-search="^{{::ds.ecsEnabled}}$">{{::ds.ecsEnabled}}</td>
<td data-search="^{{::ds.edgeHeaderRewrite}}$">{{::ds.edgeHeaderRewrite}}</td>
<td data-search="^{{::ds.fqPacingRate}}$">{{::ds.fqPacingRate}}</td>
<td data-search="^{{::geoLimit(ds)}}$">{{::geoLimit(ds)}}</td>
Expand Down Expand Up @@ -158,7 +160,7 @@
<td data-search="^{{::ds.trResponseHeaders}}$">{{::ds.trResponseHeaders}}</td>
<td data-search="^{{::ds.trRequestHeaders}}$">{{::ds.trRequestHeaders}}</td>
<td data-search="^{{::ds.type}}$">{{::ds.type}}</td>
<td data-search="^{{::ds.xmlId}}$">{{::ds.xmlId}}</td>
<td name="xmlId" data-search="^{{::ds.xmlId}}$">{{::ds.xmlId}}</td>
</tr>
</tbody>
</table>
Expand Down
4 changes: 3 additions & 1 deletion ...app/src/common/modules/table/serverDeliveryServices/table.serverDeliveryServices.tpl.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
<th>DNS Bypass TTL</th>
<th>DNS TTL</th>
<th>DSCP</th>
<th>ECS Enabled</th>
<th>Edge Header Rewrite Rules</th>
<th>FQ Pacing Rate</th>
<th>Geo Limit</th>
Expand Down Expand Up @@ -130,6 +131,7 @@
<td data-search="^{{::ds.dnsBypassTtl}}$">{{::ds.dnsBypassTtl}}</td>
<td data-search="^{{::ds.ccrDnsTtl}}$">{{::ds.ccrDnsTtl}}</td>
<td data-search="^{{::ds.dscp}}$">{{::ds.dscp}}</td>
<td data-search="^{{::ds.ecsEnabled}}$">{{::ds.ecsEnabled}}</td>
<td data-search="^{{::ds.edgeHeaderRewrite}}$">{{::ds.edgeHeaderRewrite}}</td>
<td data-search="^{{::ds.fqPacingRate}}$">{{::ds.fqPacingRate}}</td>
<td data-search="^{{::geoLimit(ds)}}$">{{::geoLimit(ds)}}</td>
Expand Down Expand Up @@ -169,7 +171,7 @@
<td data-search="^{{::ds.trResponseHeaders}}$">{{::ds.trResponseHeaders}}</td>
<td data-search="^{{::ds.trRequestHeaders}}$">{{::ds.trRequestHeaders}}</td>
<td data-search="^{{::ds.type}}$">{{::ds.type}}</td>
<td data-search="^{{::ds.xmlId}}$">{{::ds.xmlId}}</td>
<td name="xmlId" data-search="^{{::ds.xmlId}}$">{{::ds.xmlId}}</td>
</tr>
</tbody>
</table>
Expand Down
4 changes: 2 additions & 2 deletions .../src/common/modules/table/tenantDeliveryServices/TableTenantDeliveryServicesController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ var TableTenantDeliveryServicesController = function(tenant, deliveryServices, $
"initComplete": function(settings, json) {
try {
// need to create the show/hide column checkboxes and bind to the current visibility
$scope.columns = JSON.parse(localStorage.getItem('DataTables_tenantDeliveryServicesTable_/')).columns;
$scope.columns = JSON.parse(localStorage.getItem('DataTables_tenantDSsTable_/')).columns;
} catch (e) {
console.error("Failure to retrieve required column info from localStorage (key=DataTables_tenantDeliveryServicesTable_/):", e);
console.error("Failure to retrieve required column info from localStorage (key=DataTables_tenantDSsTable_/):", e);
}
}
});
Expand Down
4 changes: 3 additions & 1 deletion ...app/src/common/modules/table/tenantDeliveryServices/table.tenantDeliveryServices.tpl.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
<th>DNS Bypass TTL</th>
<th>DNS TTL</th>
<th>DSCP</th>
<th>ECS Enabled</th>
<th>Edge Header Rewrite Rules</th>
<th>FQ Pacing Rate</th>
<th>Geo Limit</th>
Expand Down Expand Up @@ -119,6 +120,7 @@
<td data-search="^{{::ds.dnsBypassTtl}}$">{{::ds.dnsBypassTtl}}</td>
<td data-search="^{{::ds.ccrDnsTtl}}$">{{::ds.ccrDnsTtl}}</td>
<td data-search="^{{::ds.dscp}}$">{{::ds.dscp}}</td>
<td data-search="^{{::ds.ecsEnabled}}$">{{::ds.ecsEnabled}}</td>
<td data-search="^{{::ds.edgeHeaderRewrite}}$">{{::ds.edgeHeaderRewrite}}</td>
<td data-search="^{{::ds.fqPacingRate}}$">{{::ds.fqPacingRate}}</td>
<td data-search="^{{::geoLimit(ds)}}$">{{::geoLimit(ds)}}</td>
Expand Down Expand Up @@ -158,7 +160,7 @@
<td data-search="^{{::ds.trResponseHeaders}}$">{{::ds.trResponseHeaders}}</td>
<td data-search="^{{::ds.trRequestHeaders}}$">{{::ds.trRequestHeaders}}</td>
<td data-search="^{{::ds.type}}$">{{::ds.type}}</td>
<td data-search="^{{::ds.xmlId}}$">{{::ds.xmlId}}</td>
<td name="xmlId" data-search="^{{::ds.xmlId}}$">{{::ds.xmlId}}</td>
</tr>
</tbody>
</table>
Expand Down
4 changes: 3 additions & 1 deletion ...tal/app/src/common/modules/table/typeDeliveryServices/table.typeDeliveryServices.tpl.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
<th>DNS Bypass TTL</th>
<th>DNS TTL</th>
<th>DSCP</th>
<th>ECS Enabled</th>
<th>Edge Header Rewrite Rules</th>
<th>FQ Pacing Rate</th>
<th>Geo Limit</th>
Expand Down Expand Up @@ -119,6 +120,7 @@
<td data-search="^{{::ds.dnsBypassTtl}}$">{{::ds.dnsBypassTtl}}</td>
<td data-search="^{{::ds.ccrDnsTtl}}$">{{::ds.ccrDnsTtl}}</td>
<td data-search="^{{::ds.dscp}}$">{{::ds.dscp}}</td>
<td data-search="^{{::ds.ecsEnabled}}$">{{::ds.ecsEnabled}}</td>
<td data-search="^{{::ds.edgeHeaderRewrite}}$">{{::ds.edgeHeaderRewrite}}</td>
<td data-search="^{{::ds.fqPacingRate}}$">{{::ds.fqPacingRate}}</td>
<td data-search="^{{::geoLimit(ds)}}$">{{::geoLimit(ds)}}</td>
Expand Down Expand Up @@ -158,7 +160,7 @@
<td data-search="^{{::ds.trResponseHeaders}}$">{{::ds.trResponseHeaders}}</td>
<td data-search="^{{::ds.trRequestHeaders}}$">{{::ds.trRequestHeaders}}</td>
<td data-search="^{{::ds.type}}$">{{::ds.type}}</td>
<td data-search="^{{::ds.xmlId}}$">{{::ds.xmlId}}</td>
<td name="xmlId" data-search="^{{::ds.xmlId}}$">{{::ds.xmlId}}</td>
</tr>
</tbody>
</table>
Expand Down
4 changes: 3 additions & 1 deletion ...tal/app/src/common/modules/table/userDeliveryServices/table.userDeliveryServices.tpl.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
<th>DNS Bypass TTL</th>
<th>DNS TTL</th>
<th>DSCP</th>
<th>ECS Enabled</th>
<th>Edge Header Rewrite Rules</th>
<th>FQ Pacing Rate</th>
<th>Geo Limit</th>
Expand Down Expand Up @@ -119,6 +120,7 @@
<td data-search="^{{::ds.dnsBypassTtl}}$">{{::ds.dnsBypassTtl}}</td>
<td data-search="^{{::ds.ccrDnsTtl}}$">{{::ds.ccrDnsTtl}}</td>
<td data-search="^{{::ds.dscp}}$">{{::ds.dscp}}</td>
<td data-search="^{{::ds.ecsEnabled}}$">{{::ds.ecsEnabled}}</td>
<td data-search="^{{::ds.edgeHeaderRewrite}}$">{{::ds.edgeHeaderRewrite}}</td>
<td data-search="^{{::ds.fqPacingRate}}$">{{::ds.fqPacingRate}}</td>
<td data-search="^{{::geoLimit(ds)}}$">{{::geoLimit(ds)}}</td>
Expand Down Expand Up @@ -158,7 +160,7 @@
<td data-search="^{{::ds.trResponseHeaders}}$">{{::ds.trResponseHeaders}}</td>
<td data-search="^{{::ds.trRequestHeaders}}$">{{::ds.trRequestHeaders}}</td>
<td data-search="^{{::ds.type}}$">{{::ds.type}}</td>
<td data-search="^{{::ds.xmlId}}$">{{::ds.xmlId}}</td>
<td name="xmlId" data-search="^{{::ds.xmlId}}$">{{::ds.xmlId}}</td>
</tr>
</tbody>
</table>
Expand Down

0 comments on commit 89ab66e

Please sign in to comment.