This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new a216d0d Display mac address in nic detail view (#3034)
a216d0d is described below
commit a216d0df3f201c94798977457325c49caa38be17
Author: Philipp Bankonier <p.bankon...@ewerk.com>
AuthorDate: Mon Nov 19 09:26:03 2018 +0100
Display mac address in nic detail view (#3034)
## Description
Adds the MAC address to the NICs detail view of an instance.
## Types of changes
- [ ] Breaking change (fix or feature that would cause existing
functionality to change)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Bug fix (non-breaking change which fixes an issue)
- [x] Enhancement (improves an existing feature and functionality)
- [ ] Cleanup (Code refactoring and cleanup, that may add test cases)
## Screenshots:
## How Has This Been Tested?
Tested locally to verify that the correct mac address gets displayed in the
detail view.
---
ui/l10n/de_DE.js | 1 +
ui/l10n/en.js | 1 +
ui/scripts/instances.js | 3 +++
3 files changed, 5 insertions(+)
diff --git a/ui/l10n/de_DE.js b/ui/l10n/de_DE.js
index e09062f..cae753e 100644
--- a/ui/l10n/de_DE.js
+++ b/ui/l10n/de_DE.js
@@ -976,6 +976,7 @@ var dictionary = {
"label.logout": "Abmelden",
"label.lun": "LUN",
"label.lxc.traffic.label": "LXC Datenverkehrs-Bezeichnung",
+ "label.mac.address": "MAC Adresse",
"label.make.project.owner": "Mache Benutzerkonto zum Projekteigentümer",
"label.make.redundant": "Redundant machen",
"label.manage": "Verwalten",
diff --git a/ui/l10n/en.js b/ui/l10n/en.js
index e0fb6e7..fb537f2 100644
--- a/ui/l10n/en.js
+++ b/ui/l10n/en.js
@@ -1014,6 +1014,7 @@ var dictionary = {
"label.management":"Management",
"label.management.ips":"Management IP Addresses",
"label.management.server":"Management Server",
+"label.mac.address": "MAC Address",
"label.mac.address.changes":"MAC Address Changes",
"label.max.cpus":"Max. CPU cores",
"label.max.guest.limit":"Max guest limit",
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 6dc45c0..3b5816b 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -2865,6 +2865,9 @@
type: {
label: 'label.type'
},
+ macaddress: {
+ label: 'label.mac.address'
+ },
ipaddress: {
label: 'label.ip.address'
},
