[Rt-commit] rt branch, 4.4/upgrade-warning, created. rt-4.4.0rc1-12-g719dfea

[Shawn Moore]

The branch, 4.4/upgrade-warning has been created
        at  719dfea5526c334547428486cb662d1251fab92a (commit)

- Log -----------------------------------------------------------------
commit 719dfea5526c334547428486cb662d1251fab92a
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Thu Nov 19 21:16:05 2015 +0000

    Avoid undef warnings in upgrading dashboards

diff --git a/etc/upgrade/4.3.5/content b/etc/upgrade/4.3.5/content
index ccfd535..84e61d7 100644
--- a/etc/upgrade/4.3.5/content
+++ b/etc/upgrade/4.3.5/content
@@ -11,7 +11,7 @@ our @Final = (
             for my $pane ( qw/body sidebar/ ) {
                 my @new;
                 for my $value ( @{$content->{$pane}} ) {
-                    if ( $value->{name} eq 'Quicksearch' && $value->{type} eq 'component' ) {
+                    if ( $value->{type} eq 'component' && $value->{name} eq 'Quicksearch' ) {
                         push @new, { %$value, name => 'QueueList' };
                         $changed = 1;
                     }
@@ -37,7 +37,7 @@ our @Final = (
             for my $pane ( qw/body sidebar/ ) {
                 my @new;
                 for my $value ( @{$content->{Panes}{$pane}} ) {
-                    if ( $value->{component} eq 'Quicksearch' ) {
+                    if ( $value->{portlet_type} eq 'component' && $value->{component} eq 'Quicksearch' ) {
                         push @new,
                           {
                             %$value,

-----------------------------------------------------------------------