small fixes

Author: JoaoJandre

server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java

@@ -842,7 +842,7 @@ public BackupSchedule configureBackupSchedule(CreateBackupScheduleCmd cmd) {
         validateQuiesceAndIsolated(offering, quiesceVm, isolated);
 
         validateMaxScheduleForIntervalType(offering, intervalType, vm);
-        validateDifferentScheduleFromExistingSchedules(vm, intervalType, scheduleString);
+        validateDifferentScheduleFromExistingSchedules(vm, intervalType, scheduleString, null);
 
         final String timezoneId = timeZone.getID();
         if (!timezoneId.equals(cmd.getTimezone())) {
@@ -894,10 +894,12 @@ public BackupSchedule configureBackupSchedule(UpdateBackupScheduleCmd cmd) {
         boolean isolated = ObjectUtils.defaultIfNull(cmd.isIsolated(), schedule.isIsolated());
         validateQuiesceAndIsolated(offering, quiesceVm, isolated);
 
+        String scheduleString = ObjectUtils.defaultIfNull(cmd.getSchedule(), schedule.getSchedule());
+        validateDifferentScheduleFromExistingSchedules(vm, intervalType, scheduleString, schedule);
+
         String timeZoneString = ObjectUtils.defaultIfNull(cmd.getTimezone(), schedule.getTimezone());
         TimeZone timeZone = TimeZone.getTimeZone(timeZoneString);
         intervalType = ObjectUtils.defaultIfNull(intervalType, schedule.getScheduleType());
-        String scheduleString = ObjectUtils.defaultIfNull(cmd.getSchedule(), schedule.getSchedule());
 
         Date nextDateTime;
         try {
@@ -2708,8 +2710,11 @@ protected void validateMaxScheduleForIntervalType(BackupOffering offering, DateU
         }
     }
 
-    private void validateDifferentScheduleFromExistingSchedules(VMInstanceVO vm, DateUtil.IntervalType intervalType, String schedule) {
+    private void validateDifferentScheduleFromExistingSchedules(VMInstanceVO vm, DateUtil.IntervalType intervalType, String schedule, BackupScheduleVO scheduleBeingValidated) {
         List<BackupScheduleVO> existingBackupSchedules = backupScheduleDao.listByVMAndIntervalType(vm.getId(), intervalType);
+        if (scheduleBeingValidated != null) {
+            existingBackupSchedules.removeIf(sched -> sched.getId() == scheduleBeingValidated.getId());
+        }
         if (existingBackupSchedules.stream().anyMatch(existingSchedule -> existingSchedule.getSchedule().equals(schedule))) {
             throw new CloudRuntimeException(String.format("VM [%s] already has a [%s] schedule at [%s]. Cannot have multiple schedules of the same type at the same time.",
                     vm.getUuid(), intervalType.name(), schedule));

ui/src/views/compute/backup/FormSchedule.vue

@@ -288,7 +288,7 @@ export default {
     initForm () {
       this.formRef = ref()
       this.form = reactive({
-        intervaltype: 'hourly',
+        intervaltype: this.scheduleToEdit?.intervaltype?.toLowerCase() ?? 'hourly',
         isolated: false
       })
       this.rules = reactive({