Get region names from API instead of hard-coding them
This commit is contained in:
@ -21,6 +21,10 @@
|
||||
padding: 0px 15px 15px;
|
||||
}
|
||||
|
||||
optgroup {
|
||||
display: none;
|
||||
}
|
||||
|
||||
tbody tr td:first-of-type {
|
||||
font-weight: bold;
|
||||
text-align: right;
|
||||
|
@ -15,13 +15,14 @@
|
||||
* along with Linode Manager Classic. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
import { settings, elements, apiGet, apiPost, parseParams, regionNames, setupHeader } from "/global.js";
|
||||
import { settings, elements, apiGet, apiPost, countryContinents, parseParams, regionNames, setupHeader } from "/global.js";
|
||||
|
||||
(function()
|
||||
{
|
||||
// Element names specific to this page
|
||||
elements.addButton = "add-button";
|
||||
elements.attachment = "attachment";
|
||||
elements.dcOther = "dc-other";
|
||||
elements.label = "label";
|
||||
elements.location = "location";
|
||||
elements.size = "size";
|
||||
@ -35,6 +36,7 @@ import { settings, elements, apiGet, apiPost, parseParams, regionNames, setupHea
|
||||
var ui = {};
|
||||
ui.addButton = {};
|
||||
ui.attachment = {};
|
||||
ui.dcOther = {};
|
||||
ui.label = {};
|
||||
ui.location = {};
|
||||
ui.size = {};
|
||||
@ -90,11 +92,19 @@ import { settings, elements, apiGet, apiPost, parseParams, regionNames, setupHea
|
||||
for (var i = 0; i < data.regions.length; i++) {
|
||||
var loc = document.createElement("option");
|
||||
loc.value = data.regions[i].id;
|
||||
if (regionNames[data.regions[i].id])
|
||||
if (data.regions[i].label && data.regions[i].label.length)
|
||||
loc.innerHTML = data.regions[i].label;
|
||||
else if (regionNames[data.regions[i].id])
|
||||
loc.innerHTML = regionNames[data.regions[i].id];
|
||||
else
|
||||
loc.innerHTML = data.regions[i].id;
|
||||
ui.location.appendChild(loc);
|
||||
var optgroup = null;
|
||||
if (countryContinents[data.regions[i].country])
|
||||
optgroup = document.getElementById(countryContinents[data.regions[i].country]);
|
||||
if (!optgroup)
|
||||
optgroup = ui.dcOther;
|
||||
optgroup.style.display = "initial";
|
||||
optgroup.appendChild(loc);
|
||||
}
|
||||
|
||||
// Request linodes in all the supported regions
|
||||
@ -180,6 +190,7 @@ import { settings, elements, apiGet, apiPost, parseParams, regionNames, setupHea
|
||||
// Get element references
|
||||
ui.addButton = document.getElementById(elements.addButton);
|
||||
ui.attachment = document.getElementById(elements.attachment);
|
||||
ui.dcOther = document.getElementById(elements.dcOther);
|
||||
ui.label = document.getElementById(elements.label);
|
||||
ui.location = document.getElementById(elements.location);
|
||||
ui.size = document.getElementById(elements.size);
|
||||
|
@ -50,6 +50,12 @@ along with Linode Manager Classic. If not, see <https://www.gnu.org/licenses/>.
|
||||
<td>
|
||||
<select id="location">
|
||||
<option selected disabled value="0">Choose A Location</option>
|
||||
<optgroup id="na" label="North America"></optgroup>
|
||||
<optgroup id="eu" label="Europe"></optgroup>
|
||||
<optgroup id="ap" label="Asia/Pacific"></optgroup>
|
||||
<optgroup id="sa" label="South America"></optgroup>
|
||||
<optgroup id="af" label="Africa"></optgroup>
|
||||
<optgroup id="dc-other" label="Other"></optgroup>
|
||||
</select>
|
||||
</td>
|
||||
<td class="info">The datacenter where the new volume should be created</td>
|
||||
|
Reference in New Issue
Block a user