Merge remote-tracking branch 'origin/4.18'

.github/workflows/ci.yml

@@ -25,6 +25,7 @@ concurrency:
 
 jobs:
   build:
+    if: github.repository == 'apache/cloudstack'
     runs-on: ubuntu-22.04
 
     strategy:

.github/workflows/main-sonar-check.yml

@@ -28,6 +28,7 @@ permissions:
 
 jobs:
   build:
+    if: github.repository == 'apache/cloudstack'
     name: Main Sonar JaCoCo Build
     runs-on: ubuntu-22.04
     steps:

ui/public/locales/en.json

@@ -599,6 +599,7 @@
 "label.delete.certificate": "Delete certificate",
 "label.delete.ciscoasa1000v": "Delete CiscoASA1000v",
 "label.delete.ciscovnmc.resource": "Delete CiscoVNMC resource",
+"label.delete.condition": "Delete condition",
 "label.delete.dedicated.vlan.range": "Deleted dedicated VLAN/VNI range.",
 "label.delete.domain": "Delete domain",
 "label.delete.events": "Delete events",

ui/src/views/compute/AutoScaleUpPolicyTab.vue

@@ -546,7 +546,7 @@ export default {
         api('deleteCondition', { id: conditionId }).then(response => {
           const jobId = response.deleteconditionresponse.jobid
           this.$pollJob({
-            title: this.$t('label.action.delete.condition'),
+            title: this.$t('label.delete.condition'),
             description: conditionId,
             jobId: jobId,
             successMethod: () => {
@@ -593,6 +593,8 @@ export default {
         threshold: this.updateConditionDetails.threshold
       }).then(response => {
         this.$pollJob({
+          title: this.$t('label.update.condition'),
+          description: this.selectedCondition.id,
           jobId: response.updateconditionresponse.jobid,
           successMessage: this.$t('message.success.update.condition'),
           successMethod: () => {

ui/src/views/compute/ScaleVM.vue

@@ -255,6 +255,8 @@ export default {
         if (jobId) {
           this.$pollJob({
             jobId,
+            title: this.$t('label.scale.vm'),
+            description: this.resource.name,
             successMethod: result => {
               this.$notification.success({
                 message: this.$t('message.success.change.offering')

ui/src/views/storage/MigrateVolume.vue

@@ -193,6 +193,8 @@ export default {
       }
       api('migrateVolume', params).then(response => {
         this.$pollJob({
+          title: this.$t('label.migrate.volume'),
+          description: this.resource.id,
           jobId: response.migratevolumeresponse.jobid,
           successMessage: this.$t('message.success.migrate.volume'),
           errorMessage: this.$t('message.migrate.volume.failed'),