diff --git a/amp/TEMPLATE/ampTemplate/js_2/esrigis/mainmapPopup.js b/amp/TEMPLATE/ampTemplate/js_2/esrigis/mainmapPopup.js
index e108e58e32e..66094f57c9c 100644
--- a/amp/TEMPLATE/ampTemplate/js_2/esrigis/mainmapPopup.js
+++ b/amp/TEMPLATE/ampTemplate/js_2/esrigis/mainmapPopup.js
@@ -71,18 +71,14 @@ function initMap() {
function loadBaseMap() {
map = L.map('map').setView([latitude, longitude], 7);
// create the tile layer with correct attribution
- var osmUrl = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
+ var osmUrl = 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
if (isOsm) {
- var subdomains = ['a', 'b', 'c'];
- if (basemapurl !== undefined && basemapurl.indexOf("mqcdn") != -1) {
- subdomains = ['otile1', 'otile2', 'otile3', 'otile4'];
- }
- var osmAttrib = 'Map data © OpenStreetMap contributors';
+ var osmAttrib = 'Map data © OpenStreetMap contributors';
tileLayer = new L.TileLayer(osmUrl, {
minZoom: 0,
maxZoom: 16,
attribution: osmAttrib,
- subdomains: subdomains
+ subdomains: ['a', 'b', 'c']
});
} else {
tileLayer = L.esri.tiledMapLayer({
diff --git a/amp/TEMPLATE/ampTemplate/tabs/js/business/grid/gridManager.js b/amp/TEMPLATE/ampTemplate/tabs/js/business/grid/gridManager.js
index 6716ce5e924..843f21f376b 100644
--- a/amp/TEMPLATE/ampTemplate/tabs/js/business/grid/gridManager.js
+++ b/amp/TEMPLATE/ampTemplate/tabs/js/business/grid/gridManager.js
@@ -34,6 +34,26 @@ define([ 'business/grid/columnsMapping', 'translationManager', 'util/tabUtils','
return '/aim/viewActivityPreview.do~activityId=' + id;
}
+ function getRowActivityId(grid, rowId) {
+ var activityId = jQuery(grid).jqGrid('getCell', rowId, app.TabsApp.COLUMN_ACTIVITY_ID);
+ // Strip whitespace and non-breaking spaces (\u00A0 / ) which hidden jqGrid
+ // cells may contain — they are truthy but not a valid numeric ID.
+ if (activityId) {
+ activityId = String(activityId).replace(/[\s\u00A0]/g, '');
+ }
+ if (!activityId) {
+ try {
+ activityId = jQuery(grid).jqGrid('getCell', rowId, 'Activity Id');
+ if (activityId) {
+ activityId = String(activityId).replace(/[\s\u00A0]/g, '');
+ }
+ } catch (error) {
+ activityId = '';
+ }
+ }
+ return activityId;
+ }
+
GridManager.prototype = {
constructor : GridManager
};
@@ -230,7 +250,7 @@ define([ 'business/grid/columnsMapping', 'translationManager', 'util/tabUtils','
//set default color and link for rows
row = this.rows[iRow];
className = row.className;
- var id = row.cells[1].textContent;
+ var id = getRowActivityId(grid, row.id);
var iconedit = "
";
var iconvalidated = ""
- + jQuery(row.cells[colIndex]).html() + "";
- jQuery(row.cells[colIndex]).html(newContent);
+ if (id) {
+ var newContent = ""
+ + jQuery(row.cells[colIndex]).html() + "