Merge branch '5.0/fix-lifecycle-new-status-remove-2' into 5.0-trunk

bestpractical · Jul 14, 2023 · cfc3b6c · cfc3b6c
2 parents b5d56d4 + cc59e60
commit cfc3b6c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/lib/RT/Lifecycle.pm b/lib/RT/Lifecycle.pm
@@ -994,8 +994,13 @@ sub ValidateLifecycle {
     # ->{actions} are handled below
     for my $state ( keys %{ $lifecycle->{defaults} || {} } ) {
         my $status = $lifecycle->{defaults}{$state};
-        push @warnings, $current_user->loc( "Nonexistant status [_1] in default states in [_2] lifecycle", lc $status, $name )
-            unless $lifecycle->{canonical_case}{ lc $status };
+        if ( $status ) {
+            push @warnings, $current_user->loc( "Nonexistant default [_1] status [_2] in [_3] lifecycle", $state, lc $status, $name )
+                unless $lifecycle->{canonical_case}{ lc $status };
+        }
+        else {
+            push @warnings, $current_user->loc( "Empty default [_1] status in [_2] Lifecycle", $state, $name );
+        }
     }
     for my $from ( keys %{ $lifecycle->{transitions} || {} } ) {
         push @warnings, $current_user->loc( "Nonexistant status [_1] in transitions in [_2] lifecycle", lc $from, $name )

diff --git a/share/static/js/lifecycleui-model.js b/share/static/js/lifecycleui-model.js
@@ -298,6 +298,7 @@ class LifecycleModel {
             initial:  [],
             active:   [],
             inactive: [],
+            defaults: {},
             transitions: {},
         };
 
@@ -306,6 +307,12 @@ class LifecycleModel {
             config[type] = self.nodes.filter(function(n) { return n.type == type }).map(function(n) { return n.name });
         });
 
+        // Set defaults on_create
+        config.defaults.on_create = config.initial[0] || config.active[0] || null;
+
+        // Clean removed states from create_nodes
+        self.create_nodes = self.create_nodes.filter(target => self.nodes.find(n => n.name == target));
+
         // Grab our links
         config.transitions[""] = self.create_nodes;