Merge remote-tracking branch 'upstream/master'

theforeman · Aug 13, 2024 · 04e37ee · 04e37ee
2 parents 041305c + f237a8c
commit 04e37ee
Show file tree

Hide file tree

Showing 43 changed files with 1,613 additions and 167 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,4 @@ Gemfile.lock
 node_modules/
 package-lock.json
 coverage/
+public/
diff --git a/app/assets/javascripts/foreman_remote_execution/locale/de/foreman_remote_execution.js b/app/assets/javascripts/foreman_remote_execution/locale/de/foreman_remote_execution.js
@@ -78,6 +78,9 @@
       "A user to be used for executing the script. If it differs from the SSH user, su or sudo is used to switch the accounts.": [
         "Ein Benutzer, der für die Ausführung des Skripts verwendet werden soll. Wenn dieser sich vom SSH-Benutzer unterscheidet, kann mittels su oder sudo der Account gewechselt werden."
       ],
+      "Abort": [
+        ""
+      ],
       "Abort Job": [
         "Job abbrechen"
       ],
@@ -153,6 +156,9 @@
       "Cancel job invocation": [
         "Job-Aufruf abbrechen"
       ],
+      "Cancel recurring": [
+        ""
+      ],
       "Canceled:": [
         ""
       ],
@@ -210,9 +216,24 @@
       "Control concurrency level and distribution over time": [
         "Parallelitätsebene und zeitliche Verteilung steuern"
       ],
+      "Could not abort the job %s: ${response}": [
+        ""
+      ],
+      "Could not cancel recurring logic %s: ${response}": [
+        ""
+      ],
+      "Could not cancel the job %s: ${response}": [
+        ""
+      ],
+      "Could not disable recurring logic %s: ${response}": [
+        ""
+      ],
       "Could not display data for job invocation.": [
         "Daten für Jobaufruf konnten nicht angezeigt werden."
       ],
+      "Could not enable recurring logic %s: ${response}": [
+        ""
+      ],
       "Could not find any suitable interface for execution": [
         "Konnte keine passende Schnitstelle zum ausführen finden."
       ],
@@ -246,6 +267,9 @@
       "Create a recurring job": [
         "Wiederholten Job erstellen"
       ],
+      "Create report": [
+        ""
+      ],
       "Create report for this job": [
         ""
       ],
@@ -318,6 +342,9 @@
       "Designation of a special purpose": [
         ""
       ],
+      "Disable recurring": [
+        ""
+      ],
       "Display advanced fields": [
         "Erweiterte Felder einblenden"
       ],
@@ -375,6 +402,9 @@
       "Enable Global Proxy": [
         "Globalen Proxy aktivieren"
       ],
+      "Enable recurring": [
+        ""
+      ],
       "End time needs to be after start time": [
         ""
       ],
@@ -681,6 +711,9 @@
       "Learn more about this in the documentation.": [
         "Mehr dazu in der Dokumentation."
       ],
+      "Legacy UI": [
+        ""
+      ],
       "List available remote execution features for a host": [
         ""
       ],
@@ -912,6 +945,15 @@
       "Recurring logic": [
         "Wiederholungslogik"
       ],
+      "Recurring logic %s cancelled successfully.": [
+        ""
+      ],
+      "Recurring logic %s disabled successfully.": [
+        ""
+      ],
+      "Recurring logic %s enabled successfully.": [
+        ""
+      ],
       "Recursive rendering of templates detected": [
         "Rekursives Rendern von Vorlagen festgestellt"
       ],
@@ -951,6 +993,9 @@
       "Rerun": [
         "Erneut ausführen"
       ],
+      "Rerun all": [
+        ""
+      ],
       "Rerun failed": [
         "Erneutes Ausführen fehlgeschlagen"
       ],
@@ -963,6 +1008,9 @@
       "Rerun on failed hosts": [
         "Erneut ausführen auf fehlgeschlagenen Hosts"
       ],
+      "Rerun successful": [
+        ""
+      ],
       "Rerun the job": [
         "Job erneut ausführen"
       ],
@@ -1357,9 +1405,15 @@
       "Trying to abort the job": [
         "Versuche Jobabbruch zu erzwingen"
       ],
+      "Trying to abort the job %s.": [
+        ""
+      ],
       "Trying to cancel the job": [
         "Versuche den Job abzubrechen"
       ],
+      "Trying to cancel the job %s.": [
+        ""
+      ],
       "Type": [
         "Typ"
       ],
@@ -1414,9 +1468,6 @@
       "Use new job wizard": [
         ""
       ],
-      "Use old form": [
-        ""
-      ],
       "User Inputs": [
         "Benutzereingaben"
       ],
@@ -1450,6 +1501,9 @@
       "View scheduled jobs": [
         ""
       ],
+      "View task": [
+        ""
+      ],
       "Web Console": [
         "Web-Konsole"
       ],

diff --git a/app/assets/javascripts/foreman_remote_execution/locale/en/foreman_remote_execution.js b/app/assets/javascripts/foreman_remote_execution/locale/en/foreman_remote_execution.js
@@ -78,6 +78,9 @@
       "A user to be used for executing the script. If it differs from the SSH user, su or sudo is used to switch the accounts.": [
         ""
       ],
+      "Abort": [
+        ""
+      ],
       "Abort Job": [
         ""
       ],
@@ -153,6 +156,9 @@
       "Cancel job invocation": [
         ""
       ],
+      "Cancel recurring": [
+        ""
+      ],
       "Canceled:": [
         ""
       ],
@@ -210,9 +216,24 @@
       "Control concurrency level and distribution over time": [
         ""
       ],
+      "Could not abort the job %s: ${response}": [
+        ""
+      ],
+      "Could not cancel recurring logic %s: ${response}": [
+        ""
+      ],
+      "Could not cancel the job %s: ${response}": [
+        ""
+      ],
+      "Could not disable recurring logic %s: ${response}": [
+        ""
+      ],
       "Could not display data for job invocation.": [
         ""
       ],
+      "Could not enable recurring logic %s: ${response}": [
+        ""
+      ],
       "Could not find any suitable interface for execution": [
         ""
       ],
@@ -246,6 +267,9 @@
       "Create a recurring job": [
         ""
       ],
+      "Create report": [
+        ""
+      ],
       "Create report for this job": [
         ""
       ],
@@ -318,6 +342,9 @@
       "Designation of a special purpose": [
         ""
       ],
+      "Disable recurring": [
+        ""
+      ],
       "Display advanced fields": [
         ""
       ],
@@ -375,6 +402,9 @@
       "Enable Global Proxy": [
         ""
       ],
+      "Enable recurring": [
+        ""
+      ],
       "End time needs to be after start time": [
         ""
       ],
@@ -681,6 +711,9 @@
       "Learn more about this in the documentation.": [
         ""
       ],
+      "Legacy UI": [
+        ""
+      ],
       "List available remote execution features for a host": [
         ""
       ],
@@ -912,6 +945,15 @@
       "Recurring logic": [
         ""
       ],
+      "Recurring logic %s cancelled successfully.": [
+        ""
+      ],
+      "Recurring logic %s disabled successfully.": [
+        ""
+      ],
+      "Recurring logic %s enabled successfully.": [
+        ""
+      ],
       "Recursive rendering of templates detected": [
         ""
       ],
@@ -951,6 +993,9 @@
       "Rerun": [
         ""
       ],
+      "Rerun all": [
+        ""
+      ],
       "Rerun failed": [
         ""
       ],
@@ -963,6 +1008,9 @@
       "Rerun on failed hosts": [
         ""
       ],
+      "Rerun successful": [
+        ""
+      ],
       "Rerun the job": [
         ""
       ],
@@ -1357,9 +1405,15 @@
       "Trying to abort the job": [
         ""
       ],
+      "Trying to abort the job %s.": [
+        ""
+      ],
       "Trying to cancel the job": [
         ""
       ],
+      "Trying to cancel the job %s.": [
+        ""
+      ],
       "Type": [
         ""
       ],
@@ -1414,9 +1468,6 @@
       "Use new job wizard": [
         ""
       ],
-      "Use old form": [
-        ""
-      ],
       "User Inputs": [
         ""
       ],
@@ -1450,6 +1501,9 @@
       "View scheduled jobs": [
         ""
       ],
+      "View task": [
+        ""
+      ],
       "Web Console": [
         ""
       ],