Fix for issue #70

Signed-off-by: megha smriti <[email protected]>
kimchi-project · Jan 9, 2017 · a283bea · a283bea
1 parent 9c84e2c
commit a283bea
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/ui/js/src/gingers390x.network-OSA-port.js b/ui/js/src/gingers390x.network-OSA-port.js
@@ -20,8 +20,13 @@ gingers390x.initOSAport = function() {
     $('.selectpicker').selectpicker('refresh');
     $('#osaport-submit').off();
     $('#osaport-submit').prop("disabled", true);
+    OSAportvalue = $('.selectpicker').val();
     $('.selectpicker').on('change', function() {
-        $('#osaport-submit').prop("disabled", false);
+      if($(this).val() == OSAportvalue){
+        $('#osaport-submit').prop("disabled", true);
+      }else{
+         $('#osaport-submit').prop("disabled", false);
+      }
     });
     var networkConfigTable = $('#network-configuration').DataTable();
     var selectedRows = ginger.listNetworkConfig.rows_indexes;
@@ -33,6 +38,7 @@ gingers390x.initOSAport = function() {
             var current_osaport = result['osa_portno'];
             $('#osa-port-status-textbox').text(current_osaport);
             $('#osaportType').selectpicker("val", current_osaport);
+            OSAportvalue = current_osaport;
         }, function() {});
     }
     $('#osaport-submit').on('click', function() {
@@ -60,7 +66,6 @@ gingers390x.initOSAport = function() {
     });
     $('#osaport-cancel').on('click', function() {
         wok.window.close();
-        gingers390x.refreshNetworkPage();
     });
     gingers390x.refreshNetworkPage = function() {
         ginger.listNetworkConfig.refreshNetworkConfigurationDatatable();

diff --git a/ui/js/src/gingers390x.network.js b/ui/js/src/gingers390x.network.js
@@ -135,6 +135,9 @@ gingers390x.enableNetworks = function(opts,osaval) {
   osaport.osa_portno = parseInt(osaval);
   var selectedRowIds = gingers390x.getSelectedRows(opts);
   if (selectedRowIds.length > 0) {
+    gingers390x.clearBootgridData(opts);
+    gingers390x.clearFilterData();
+    gingers390x.hideBootgridData(opts);
     opts['loadingMessage'] = i18n['GS390XNW007E'];
     gingers390x.showBootgridLoading(opts);
 

diff --git a/ui/pages/host-network-add-osaport.html.tmpl b/ui/pages/host-network-add-osaport.html.tmpl
@@ -59,7 +59,7 @@
                 </form>
                 </div>
                 <p class="help-block">
-                    <i class="fa fa-info-circle"></i>$_("Note* Some of the OSA Cards comes with two ports and triplet can be configured on one of them. Please choose the relevant port based on the OSA card configurations.")</p>
+                    <i class="fa fa-info-circle"></i>$_(" Note* Some of the OSA Cards comes with two ports and triplet can be configured on one of them. Please choose the relevant port based on the OSA card configurations.")</p>
             </div>
             <div class="modal-footer">
                 <button type="button" id="osaport-add-submit" class="btn btn-default">$_("Apply")</button>

diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl
@@ -111,7 +111,7 @@
      "GS390XSD0010M": "$_("Following devices cannot be removed because of the missing device type.Please rectify the issue by manually logging onto the system via console.")",
      "GS390XSD011M": "$_("Create Partition")",
 
-     "GS390XOSA001M": "$_("Do you want to change the OSA port configuration of the interface %1 to %2.<br> Please confirm !!!")",
+     "GS390XOSA001M": "$_("Do you want to change the OSA port configuration of the interface %1 to %2.<br> This may affect network connectivity. Please confirm !!!")",
      "GS390XOSA002M": "$_("Successfully updated OSA port configuration of the interface ")",
      "GS390XOSA003M": "$_("Ok")",
      "GS390XOSA004M": "$_("Set OSA Port")",