Closes-Bug: #1551071

Closes-Bug: #1550969 Closes-Bug: #1549659 1. Provision to change display_name in security group 2. Number of Instances in a Service Scaling Scenario should be greater than 0 3. Global config page is not a grid, so we can not export it through export as CSV option, so hiding it. Change-Id: I4bb5fa1f37e29ae615c15720e221d0cedc5bebe3 (cherry picked from commit 1526e28)
Juniper · Mar 15, 2016 · 01b417a · 01b417a
1 parent 23bc415
commit 01b417a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/webroot/config/infra/globalconfig/ui/js/views/GlobalConfigGridView.js b/webroot/config/infra/globalconfig/ui/js/views/GlobalConfigGridView.js
@@ -54,6 +54,9 @@ define([
                 title: {
                     text: ctwl.TITLE_GLOBAL_CONFIG
                 },
+                defaultControls: {
+                    exportable: false
+                },
                 advanceControls: getHeaderActionConfig(),
             },
             body: {

diff --git a/webroot/config/networking/securitygroup/ui/js/models/SecGrpModel.js b/webroot/config/networking/securitygroup/ui/js/models/SecGrpModel.js
@@ -164,13 +164,14 @@ define([
                 var newSecGrpData = $.extend({}, true, this.model().attributes);
 
                 var ruleList = this.getSecGrpRuleList(newSecGrpData);
+                ctwu.setNameFromDisplayName(newSecGrpData);
                 var fqnArr = [];
                 if (null != newSecGrpData['fq_name']) {
                     fqnArr = newSecGrpData['fq_name'];
                 } else {
                     fqnArr = projFqn;
                     newSecGrpData['fq_name'] =
-                        fqnArr.concat([newSecGrpData['display_name']]);
+                        fqnArr.concat([newSecGrpData['name']]);
                 }
                 var configRules =
                     sgUtils.buildUIToConfigSGList(fqnArr[0],

diff --git a/webroot/config/networking/securitygroup/ui/js/views/SecGrpEditView.js b/webroot/config/networking/securitygroup/ui/js/views/SecGrpEditView.js
@@ -114,7 +114,6 @@ define([
                                 view: 'FormInputView',
                                 viewConfig: {
                                     label: 'Name',
-                                    disabled: isDisable,
                                     path: 'display_name',
                                     class: 'span9',
                                     dataBindValue: 'display_name',

diff --git a/webroot/config/services/instances/ui/js/models/svcInstModel.js b/webroot/config/services/instances/ui/js/models/svcInstModel.js
@@ -62,7 +62,14 @@ define([
                         return;
                     }
                     if ((null == val) || (isNaN(val))) {
-                        return 'Instance count should be integer';
+                        return 'Instance count must be between 1 and 64';
+                    }
+                    if (typeof val == 'string') {
+                        val = val.trim();
+                        val = Number(val);
+                    }
+                    if ((val < 1) || (val > 64)) {
+                        return 'Instance count must be between 1 and 64';
                     }
                 },
                 'display_name': function(val, attr, data) {