From ffc60145b81d1dbf7b5064c4b94d7b4134b7bf80 Mon Sep 17 00:00:00 2001 From: Graham Hayes Date: Tue, 31 Jan 2017 22:40:56 +0000 Subject: [PATCH] Actually show attribute on zone info page also fix creating secondary zones Change-Id: I90093d7547f3289141323a315bb779d342e3bbe9 --- .../os-designate-zone/actions/common-forms.service.js | 3 ++- .../os-designate-zone/details/overview.controller.js | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/designatedashboard/static/designatedashboard/resources/os-designate-zone/actions/common-forms.service.js b/designatedashboard/static/designatedashboard/resources/os-designate-zone/actions/common-forms.service.js index 7587524..55df08f 100644 --- a/designatedashboard/static/designatedashboard/resources/os-designate-zone/actions/common-forms.service.js +++ b/designatedashboard/static/designatedashboard/resources/os-designate-zone/actions/common-forms.service.js @@ -128,10 +128,10 @@ { "key": "email", "title": gettext("Email Address"), - "placeholder": "owner@example.com", "description": gettext("Email address to contact the zone owner."), "validationMessage": gettext("Email address must contain a single '@' character"), "type": "text", + "condition": "model.type == 'PRIMARY'", "required": true }, { @@ -139,6 +139,7 @@ "title": gettext("TTL"), "description": gettext("Time To Live in seconds."), "type": "number", + "condition": "model.type == 'PRIMARY'", "required": true }, { diff --git a/designatedashboard/static/designatedashboard/resources/os-designate-zone/details/overview.controller.js b/designatedashboard/static/designatedashboard/resources/os-designate-zone/details/overview.controller.js index f9396b1..58c5601 100644 --- a/designatedashboard/static/designatedashboard/resources/os-designate-zone/details/overview.controller.js +++ b/designatedashboard/static/designatedashboard/resources/os-designate-zone/details/overview.controller.js @@ -40,6 +40,15 @@ function onGetResponse(response) { ctrl.item = response.data; + + var attr = ''; + var keys = Object.keys(response.data.attributes); + + for (var i = keys.length - 1; i >= 0; i--) { + attr += keys[i] + ':' + response.data.attributes[keys[i]] + ', '; + } + + ctrl.item.attributes = attr; } }