diff --git a/traffic_ops/traffic_ops_golang/server/put_status.go b/traffic_ops/traffic_ops_golang/server/put_status.go index d66060a49f..08838db4a4 100644 --- a/traffic_ops/traffic_ops_golang/server/put_status.go +++ b/traffic_ops/traffic_ops_golang/server/put_status.go @@ -121,12 +121,10 @@ func UpdateStatusHandler(w http.ResponseWriter, r *http.Request) { return } - if *status.Name == tc.CacheStatusAdminDown.String() || *status.Name == tc.CacheStatusOffline.String() { - if reqObj.OfflineReason == nil { - api.HandleErr(w, r, tx, http.StatusBadRequest, errors.New("offlineReason is required for "+tc.CacheStatusAdminDown.String()+" or "+tc.CacheStatusOffline.String()+" status"), nil) - return + if *status.Name != tc.CacheStatusOnline.String() && *status.Name != tc.CacheStatusReported.String() { + if reqObj.OfflineReason != nil { + *reqObj.OfflineReason = inf.User.UserName + ": " + *reqObj.OfflineReason } - *reqObj.OfflineReason = inf.User.UserName + ": " + *reqObj.OfflineReason } else { reqObj.OfflineReason = nil } diff --git a/traffic_portal/app/src/common/modules/dialog/select/status/DialogSelectStatusController.js b/traffic_portal/app/src/common/modules/dialog/select/status/DialogSelectStatusController.js index 6bdf02e804..73d531a933 100644 --- a/traffic_portal/app/src/common/modules/dialog/select/status/DialogSelectStatusController.js +++ b/traffic_portal/app/src/common/modules/dialog/select/status/DialogSelectStatusController.js @@ -48,7 +48,7 @@ var DialogSelectStatusController = function(server, statuses, $scope, $uibModalI $scope.offline = function () { var selectedStatus = _.find(statuses, function(status){ return parseInt(status.id) == parseInt($scope.selectedStatusId) }); - return selectedStatus && (selectedStatus.name == "ADMIN_DOWN" || selectedStatus.name == "OFFLINE"); + return selectedStatus && (selectedStatus.name != "ONLINE" && selectedStatus.name != "REPORTED"); }; }; diff --git a/traffic_portal/app/src/common/modules/dialog/select/status/dialog.select.status.tpl.html b/traffic_portal/app/src/common/modules/dialog/select/status/dialog.select.status.tpl.html index 335a1905bb..e1ff0519d3 100644 --- a/traffic_portal/app/src/common/modules/dialog/select/status/dialog.select.status.tpl.html +++ b/traffic_portal/app/src/common/modules/dialog/select/status/dialog.select.status.tpl.html @@ -39,10 +39,10 @@
Note: Config file updates will be queued on ALL
-