diff --git a/kb_server/public/ui/scripts/controllers/config_storage.js b/kb_server/public/ui/scripts/controllers/config_storage.js index 5e27f2c..2ecfe65 100644 --- a/kb_server/public/ui/scripts/controllers/config_storage.js +++ b/kb_server/public/ui/scripts/controllers/config_storage.js @@ -31,7 +31,7 @@ angular.module("kbWebApp").controller("StorageConfigCtrl", function($scope, $htt console.log("status error"); }) : ($scope.status = "NO SESSION ID", kbCookie.setStatus("")); }; - var disabledStagingConfig = !1; + var disabledStagingConfig = !1, disabledStagedConfig = !0; $scope.disableConfig = function(disableId) { $("#" + disableId).find("input,button,a,md-radio-button").each(function() { $(this).attr("disabled", "disabled"); @@ -42,8 +42,12 @@ angular.module("kbWebApp").controller("StorageConfigCtrl", function($scope, $htt }); }, $scope.configStatus = function() { "READY" === $scope.status ? disabledStagingConfig === !0 && (disabledStagingConfig = !1, - $scope.enableConfig("stagingConfig3"), $scope.enableConfig("getButton")) : disabledStagingConfig === !1 && (disabledStagingConfig = !0, - $scope.disableConfig("stagingConfig3"), $scope.disableConfig("getButton")); + disabledStagedConfig = !0, $scope.enableConfig("dashboard_general"), $scope.enableConfig("dashboard_server"), + $scope.enableConfig("getButton")) : "STAGED" === $scope.status ? disabledStagedConfig === !0 && (disabledStagingConfig = !0, + disabledStagedConfig = !1, $scope.disableConfig("dashboard_general"), $scope.enableConfig("dashboard_server"), + $scope.enableConfig("getButton")) : disabledStagingConfig !== !1 && disabledStagedConfig !== !1 || (disabledStagingConfig = !0, + disabledStagedConfig = !0, $scope.disableConfig("dashboard_general"), $scope.disableConfig("dashboard_server"), + $scope.disableConfig("getButton")); }, $("#dropdownrandrw").append('
  • '), $scope.storageMode = { randread: { name: "Random Read", diff --git a/kb_server/public/ui/scripts/controllers/run_storage.js b/kb_server/public/ui/scripts/controllers/run_storage.js index 10df92a..82525b3 100644 --- a/kb_server/public/ui/scripts/controllers/run_storage.js +++ b/kb_server/public/ui/scripts/controllers/run_storage.js @@ -443,7 +443,7 @@ angular.module("kbWebApp").controller("RunStorageCtrl", function($scope, $timeou }, $scope.saveResult = function() { var date = new Date(), m = to2(date.getMonth() + 1), d = to2(date.getDate()), h = to2(date.getHours()), min = to2(date.getMinutes()), filename = "" + m + d + h + min + ".html", saveData = storageMode.getResult(); if ("" != saveData) { - var myresult = ' KloudBuster Report

    KloudBuster Storage Test Report

    {{current_mode_description}}

    {{modes[current_mode_name]["title"]}} {{current_title}} ({{storage_target[from_outside.storage_target]}})
    {{current_mode["y_axis"]}}Latency(ms)
    {{row.total_client_vms}} {{row.block_size}}b {{row.iodepth}} {{row.rate_iops}} {{row.read_iops}} {{row.write_iops}} {{row.rate}} KB/s {{row.read_bw}} KB/s {{row.write_bw}} KB/s

    KloudBuster HTTP Test Configuration

    '; + var myresult = ' KloudBuster Report

    KloudBuster Storage Test Report

    {{current_mode_description}}

    {{modes[current_mode_name]["title"]}} {{current_title}} ({{storage_target[from_outside.storage_target]}})
    {{current_mode["y_axis"]}}Latency(ms)
    {{row.total_client_vms}} {{row.block_size}}b {{row.iodepth}} {{row.rate_iops}} {{row.read_iops}} {{row.write_iops}} {{row.rate}} KB/s {{row.read_bw}} KB/s {{row.write_bw}} KB/s

    KloudBuster Storage Test Configuration

    '; downloadFile(filename, myresult); } else showAlert.showAlert("No result to save!"); }, setInterval(function() { diff --git a/kb_server/public/ui/views/config_storage.html b/kb_server/public/ui/views/config_storage.html index f39baa9..a22ce9c 100644 --- a/kb_server/public/ui/views/config_storage.html +++ b/kb_server/public/ui/views/config_storage.html @@ -33,7 +33,7 @@ permissions and limitations under the License.
    -
    +