Merge ~andreserl/maas:ui_revert_minor_change into maas:master

Proposed by Andres Rodriguez
Status: Merged
Approved by: Andres Rodriguez
Approved revision: be55d753e36acb4a425f61befa2886ae60e2745c
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~andreserl/maas:ui_revert_minor_change
Merge into: maas:master
Diff against target: 13 lines (+1/-1)
1 file modified
src/maasserver/static/js/angular/controllers/node_details_networking.js (+1/-1)
Reviewer Review Type Date Requested Status
Andres Rodriguez (community) Approve
Review via email: mp+355954@code.launchpad.net

Commit message

Minor revert of UI change introduced with 7297bf1 that changed untagged to Default VLAN on interface listing.

Reverting maintains the consistency of terminology across the UI (and the API)

Description of the change

This is a minor revert of https://code.launchpad.net/~caleb-ellis/maas/+git/maas/+merge/355929, which breaks UI consistency in itself, as well as API. This ensures terminology is consistent.

To post a comment you must log in.
Revision history for this message
Andres Rodriguez (andreserl) wrote :

selfie as is a revert!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/static/js/angular/controllers/node_details_networking.js b/src/maasserver/static/js/angular/controllers/node_details_networking.js
2index 0d1d0cb..14962df 100644
3--- a/src/maasserver/static/js/angular/controllers/node_details_networking.js
4+++ b/src/maasserver/static/js/angular/controllers/node_details_networking.js
5@@ -659,7 +659,7 @@ angular.module('MAAS').controller('NodeNetworkingController', [
6 }
7
8 if(vlan.vid === 0) {
9- return "Default VLAN";
10+ return "untagged";
11 } else if(angular.isString(vlan.name) && vlan.name.length > 0) {
12 return vlan.vid + " (" + vlan.name + ")";
13 } else {

Subscribers

People subscribed via source and target branches