From 040f2b4db6f957bcd4b9a55dfbd58db4117c2ef7 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Wed, 27 May 2015 16:35:06 +0200 Subject: [PATCH] feature #3748: Rename and move custom-tags to utils/custom-tags-table --- .../public/app/tabs/vnets-tab/form-panels/create.js | 10 +++++----- src/sunstone/public/app/tabs/vnets-tab/utils/ar-tab.js | 10 +++++----- .../custom-tags.js => custom-tags-table.js} | 2 +- .../custom-tags.hbs => custom-tags-table/html.hbs} | 0 4 files changed, 11 insertions(+), 11 deletions(-) rename src/sunstone/public/app/utils/{form-panels/custom-tags.js => custom-tags-table.js} (97%) rename src/sunstone/public/app/utils/{form-panels/custom-tags.hbs => custom-tags-table/html.hbs} (100%) diff --git a/src/sunstone/public/app/tabs/vnets-tab/form-panels/create.js b/src/sunstone/public/app/tabs/vnets-tab/form-panels/create.js index b4b61dac75..550da0a792 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/vnets-tab/form-panels/create.js @@ -8,7 +8,7 @@ define(function(require) { var Sunstone = require('sunstone'); var Locale = require('utils/locale'); var Tips = require('utils/tips'); - var CustomTags = require('utils/form-panels/custom-tags'); + var CustomTagsTable = require('utils/custom-tags-table'); var ArTab = require('tabs/vnets-tab/utils/ar-tab'); var SecurityGroupsTable = require('tabs/secgroups-tab/datatable'); var TemplateUtils = require('utils/template-utils'); @@ -80,7 +80,7 @@ define(function(require) { return TemplateWizardHTML({ 'formPanelId': this.formPanelId, - 'customTagsHTML': CustomTags.html(), + 'customTagsHTML': CustomTagsTable.html(), 'securityGroupsTableHTML': this.securityGroupsTable.dataTableHTML }); } @@ -215,7 +215,7 @@ define(function(require) { this.securityGroupsTable.initialize(); - CustomTags.setup($("#vnetCreateContextTab", context)); + CustomTagsTable.setup($("#vnetCreateContextTab", context)); // Add first AR $("#vnet_wizard_ar_btn", context).trigger("click"); @@ -264,7 +264,7 @@ define(function(require) { network_json["SECURITY_GROUPS"] = secgroups.join(","); } - $.extend(network_json, CustomTags.retrieve($("#vnetCreateContextTab", context))); + $.extend(network_json, CustomTagsTable.retrieve($("#vnetCreateContextTab", context))); $('.ar_tab', context).each(function() { var ar_id = $(this).attr("ar_id"); @@ -364,7 +364,7 @@ define(function(require) { delete element.TEMPLATE[field_name]; }); - CustomTags.fill($("#vnetCreateContextTab", context), element.TEMPLATE); + CustomTagsTable.fill($("#vnetCreateContextTab", context), element.TEMPLATE); // Remove the first AR added in initialize_ $("#vnetCreateARTab i.remove-tab", context).trigger("click"); diff --git a/src/sunstone/public/app/tabs/vnets-tab/utils/ar-tab.js b/src/sunstone/public/app/tabs/vnets-tab/utils/ar-tab.js index c9fbb191ee..57b0f95bda 100644 --- a/src/sunstone/public/app/tabs/vnets-tab/utils/ar-tab.js +++ b/src/sunstone/public/app/tabs/vnets-tab/utils/ar-tab.js @@ -2,7 +2,7 @@ define(function(require) { // Dependencies var Locale = require('utils/locale'); var Tips = require('utils/tips'); - var CustomTags = require('utils/form-panels/custom-tags'); + var CustomTagsTable = require('utils/custom-tags-table'); var WizardFields = require('utils/wizard-fields'); var SecurityGroupsTable = require('tabs/secgroups-tab/datatable'); @@ -33,7 +33,7 @@ define(function(require) { return TemplateHTML({ 'str_ar_tab_id': str_ar_tab_id, - 'customTagsHTML': CustomTags.html(), + 'customTagsHTML': CustomTagsTable.html(), 'securityGroupsTableHTML': this.securityGroupsTable.dataTableHTML }); } @@ -70,7 +70,7 @@ define(function(require) { $('input#'+str_ar_tab_id+'_ar_type_ip4',ar_section).prop('checked', true); $('input#'+str_ar_tab_id+'_ar_type_ip4',ar_section).change(); - CustomTags.setup($('#'+str_ar_tab_id+'_custom_tags',ar_section)); + CustomTagsTable.setup($('#'+str_ar_tab_id+'_custom_tags',ar_section)); this.securityGroupsTable.initialize(); @@ -116,7 +116,7 @@ define(function(require) { data["TYPE"] = ar_type; } - $.extend(data, CustomTags.retrieve(this.ar_section)); + $.extend(data, CustomTagsTable.retrieve(this.ar_section)); var str_ar_tab_id = $('div[name="str_ar_tab_id"]', this.ar_section).attr("str_ar_tab_id"); @@ -161,7 +161,7 @@ define(function(require) { delete ar_json["SECURITY_GROUPS"]; - CustomTags.fill(this.ar_section, ar_json); + CustomTagsTable.fill(this.ar_section, ar_json); $('input[name$="ar_type"]',this.ar_section).prop("disabled", true); $('input[wizard_field="IP"]',this.ar_section).prop("disabled", true); diff --git a/src/sunstone/public/app/utils/form-panels/custom-tags.js b/src/sunstone/public/app/utils/custom-tags-table.js similarity index 97% rename from src/sunstone/public/app/utils/form-panels/custom-tags.js rename to src/sunstone/public/app/utils/custom-tags-table.js index a550d00d68..2c40c0161b 100644 --- a/src/sunstone/public/app/utils/form-panels/custom-tags.js +++ b/src/sunstone/public/app/utils/custom-tags-table.js @@ -1,7 +1,7 @@ define(function(require) { var Locale = require('utils/locale'); - var TemplateHTML = require('hbs!./custom-tags'); + var TemplateHTML = require('hbs!./custom-tags-table/html'); var TemplateUtils = require('utils/template-utils'); function _html(){ diff --git a/src/sunstone/public/app/utils/form-panels/custom-tags.hbs b/src/sunstone/public/app/utils/custom-tags-table/html.hbs similarity index 100% rename from src/sunstone/public/app/utils/form-panels/custom-tags.hbs rename to src/sunstone/public/app/utils/custom-tags-table/html.hbs