From f954622ae29ba762e9a525572855283607e734bd Mon Sep 17 00:00:00 2001 From: Hiroyuki Eguchi Date: Thu, 9 Feb 2017 21:09:45 +0900 Subject: [PATCH] Change field type of dataset Modify field type so that user can select from datasets without specify manually. Change-Id: Idce312380a3c97c9e5653395a9bb4350c3655548 --- .../common/dataset/common.dataset.controller.js | 16 ++++++++++++++-- .../machine_learning/common/dataset/dataset.html | 8 +++++--- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/meteos_ui/static/dashboard/machine_learning/common/dataset/common.dataset.controller.js b/meteos_ui/static/dashboard/machine_learning/common/dataset/common.dataset.controller.js index ffe8461..789c138 100644 --- a/meteos_ui/static/dashboard/machine_learning/common/dataset/common.dataset.controller.js +++ b/meteos_ui/static/dashboard/machine_learning/common/dataset/common.dataset.controller.js @@ -28,11 +28,13 @@ commonDatasetController.$inject = [ '$scope', - 'horizon.framework.util.i18n.gettext' + 'horizon.framework.util.i18n.gettext', + 'horizon.app.core.openstack-service-api.meteos' ]; - function commonDatasetController($scope, gettext) { + function commonDatasetController($scope, gettext, meteos) { var ctrl = this; + ctrl.datasets = []; ctrl.datasetLocationOptions = [ { label: gettext('Swift'), value: 'swift' }, @@ -45,5 +47,15 @@ { label: gettext('Text'), value: 'text' } ]; + init(); + + function init() { + meteos.getDatasets().success(onGetDatasets); + } + + function onGetDatasets(response) { + ctrl.datasets = response.items; + } + } })(); diff --git a/meteos_ui/static/dashboard/machine_learning/common/dataset/dataset.html b/meteos_ui/static/dashboard/machine_learning/common/dataset/dataset.html index 662d178..79a1c60 100644 --- a/meteos_ui/static/dashboard/machine_learning/common/dataset/dataset.html +++ b/meteos_ui/static/dashboard/machine_learning/common/dataset/dataset.html @@ -65,9 +65,11 @@ Dataset UUID - +