From 569cd96d773e96b29da5bf290ab99992d7c19cd4 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Mon, 21 Dec 2015 19:13:18 +0100 Subject: [PATCH] feature #4184: Add labels filter support to cloud view --- src/sunstone/public/app/tabs/provision-tab.js | 36 +++++++++++++++--- .../app/tabs/provision-tab/templates/list.js | 5 +++ .../app/tabs/provision-tab/vms/create.hbs | 38 ++++++++++++++----- src/sunstone/public/scss/app.scss | 1 + 4 files changed, 66 insertions(+), 14 deletions(-) diff --git a/src/sunstone/public/app/tabs/provision-tab.js b/src/sunstone/public/app/tabs/provision-tab.js index 770416427b..4848c46c73 100644 --- a/src/sunstone/public/app/tabs/provision-tab.js +++ b/src/sunstone/public/app/tabs/provision-tab.js @@ -35,6 +35,7 @@ define(function(require) { var DisksResize = require('utils/disks-resize'); var NicsSection = require('utils/nics-section'); var TemplateUtils = require('utils/template-utils'); + var LabelsUtils = require('utils/labels/utils'); var ProvisionQuotaWidget = require('./provision-tab/users/quota-widget'); @@ -56,6 +57,7 @@ define(function(require) { var TemplateGroupInfo = require('hbs!./provision-tab/group/info'); var TAB_ID = require('./provision-tab/tabId'); + var TEMPLATE_LABELS_COLUMN = 4; var povision_actions = { "Provision.User.create" : { @@ -1206,7 +1208,9 @@ define(function(require) { "aoColumns": [ { "mDataProp": "VMTEMPLATE.ID" }, { "mDataProp": "VMTEMPLATE.NAME" }, - { "mDataProp": "VMTEMPLATE.TEMPLATE.SAVED_TEMPLATE_ID", "sDefaultContent" : "-" } + { "mDataProp": "VMTEMPLATE.TEMPLATE.SAVED_TEMPLATE_ID", "sDefaultContent" : "-" }, + { "mDataProp": "VMTEMPLATE.PERMISSIONS.GROUP_U" }, + { "mDataProp": "VMTEMPLATE.TEMPLATE.LABELS", "sDefaultContent" : "-" } ], "fnPreDrawCallback": function (oSettings) { initializeTemplateCards(this, "provision_system_templates") @@ -1214,6 +1218,8 @@ define(function(require) { "fnRowCallback": function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) { appendTemplateCard(aData, "provision_system_templates"); return nRow; + }, + "fnDrawCallback": function(oSettings) { } }); @@ -1229,7 +1235,8 @@ define(function(require) { { "mDataProp": "VMTEMPLATE.ID" }, { "mDataProp": "VMTEMPLATE.NAME" }, { "mDataProp": "VMTEMPLATE.TEMPLATE.SAVED_TEMPLATE_ID", "sDefaultContent" : "-" }, - { "mDataProp": "VMTEMPLATE.PERMISSIONS.GROUP_U" } + { "mDataProp": "VMTEMPLATE.PERMISSIONS.GROUP_U" }, + { "mDataProp": "VMTEMPLATE.TEMPLATE.LABELS", "sDefaultContent" : "-" } ], "fnPreDrawCallback": function (oSettings) { initializeTemplateCards(this, "provision_vdc_templates") @@ -1252,7 +1259,8 @@ define(function(require) { { "mDataProp": "VMTEMPLATE.ID" }, { "mDataProp": "VMTEMPLATE.NAME" }, { "mDataProp": "VMTEMPLATE.TEMPLATE.SAVED_TEMPLATE_ID", "sDefaultContent" : "-" }, - { "mDataProp": "VMTEMPLATE.PERMISSIONS.GROUP_U" } + { "mDataProp": "VMTEMPLATE.PERMISSIONS.GROUP_U" }, + { "mDataProp": "VMTEMPLATE.TEMPLATE.LABELS", "sDefaultContent" : "-" } ], "fnPreDrawCallback": function (oSettings) { initializeTemplateCards(this, "provision_saved_templates") @@ -1264,12 +1272,30 @@ define(function(require) { }); - $('#provision_create_template_search').on('input',function(){ + $('#provision_create_system_template_search').on('input',function(){ provision_system_templates_datatable.fnFilter( $(this).val() ); - provision_saved_templates_datatable.fnFilter( $(this).val() ); + }) + + $('#provision_create_vdc_template_search').on('input',function(){ provision_vdc_templates_datatable.fnFilter( $(this).val() ); }) + $('#provision_create_saved_template_search').on('input',function(){ + provision_saved_templates_datatable.fnFilter( $(this).val() ); + }) + + $('[href="#provision_system_templates_selector"]').on('click', function() { + ProvisionTemplatesList.updateDatatable(provision_system_templates_datatable); + }) + + $('[href="#provision_saved_templates_selector"]').on('click', function() { + ProvisionTemplatesList.updateDatatable(provision_saved_templates_datatable); + }) + + $('[href="#provision_vdc_templates_selector"]').on('click', function() { + ProvisionTemplatesList.updateDatatable(provision_vdc_templates_datatable); + }) + $("#provision_create_template_refresh_button").click(function(){ OpenNebula.Action.clear_cache("VMTEMPLATE"); ProvisionTemplatesList.updateDatatable(provision_system_templates_datatable); diff --git a/src/sunstone/public/app/tabs/provision-tab/templates/list.js b/src/sunstone/public/app/tabs/provision-tab/templates/list.js index 81b863c051..96d0ae80a2 100644 --- a/src/sunstone/public/app/tabs/provision-tab/templates/list.js +++ b/src/sunstone/public/app/tabs/provision-tab/templates/list.js @@ -22,10 +22,12 @@ define(function(require) { var Notifier = require('utils/notifier'); var Humanize = require('utils/humanize'); var ResourceSelect = require('utils/resource-select'); + var LabelsUtils = require('utils/labels/utils'); var TemplateTemplatesList = require('hbs!./list'); var _accordionId = 0; + var TEMPLATE_LABELS_COLUMN = 4; return { 'generate': generate_provision_templates_list, @@ -90,6 +92,9 @@ define(function(require) { ''); } else { datatable.fnAddData(item_list); + LabelsUtils.clearLabelsFilter(datatable, TEMPLATE_LABELS_COLUMN); + var context = $('.labels-dropdown', datatable.closest('.content')); + LabelsUtils.insertLabelsMenu(context, datatable, TEMPLATE_LABELS_COLUMN, "VMTEMPLATE.TEMPLATE.LABELS"); } }, error: Notifier.onError diff --git a/src/sunstone/public/app/tabs/provision-tab/vms/create.hbs b/src/sunstone/public/app/tabs/provision-tab/vms/create.hbs index 3676762a15..c12b0e8a82 100644 --- a/src/sunstone/public/app/tabs/provision-tab/vms/create.hbs +++ b/src/sunstone/public/app/tabs/provision-tab/vms/create.hbs @@ -13,7 +13,6 @@ {{! See the License for the specific language governing permissions and }} {{! limitations under the License. }} {{! -------------------------------------------------------------------------- }} -