[otrs-cvs] GeneralCatalog/Kernel/Modules AdminGeneralCatalog.pm, 1.20, 1.21

[cvs-log at otrs.org]

Comments:
Update of /home/cvs/GeneralCatalog/Kernel/Modules
In directory lancelot:/tmp/cvs-serv4916/Kernel/Modules

Modified Files:
	AdminGeneralCatalog.pm 
Log Message:
Fixed bugs #2750, #2751, #2752.

Author: mh

Index: AdminGeneralCatalog.pm
===================================================================
RCS file: /home/cvs/GeneralCatalog/Kernel/Modules/AdminGeneralCatalog.pm,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** AdminGeneralCatalog.pm	20 Feb 2008 09:31:45 -0000	1.20
--- AdminGeneralCatalog.pm	6 Mar 2008 14:28:04 -0000	1.21
***************
*** 87,90 ****
--- 87,94 ----
          );
  
+         # check item list
+         return $Self->{LayoutObject}->ErrorScreen()
+             if !$ItemIDList || !%{$ItemIDList};
+ 
          my $CssClass = '';
          for my $ItemID ( sort { $ItemIDList->{$a} cmp $ItemIDList->{$b} } keys %{$ItemIDList} ) {
***************
*** 149,152 ****
--- 153,161 ----
                  ItemID => $ItemData{ItemID},
              );
+ 
+             # check item data
+             return $Self->{LayoutObject}->ErrorScreen()
+                 if !$ItemDataRef;
+ 
              %ItemData = %{$ItemDataRef};
          }
***************
*** 171,184 ****
          );
  
!         # generate FunctionalityOptionStrg
          my $FunctionalityRef = $Self->{GeneralCatalogObject}->FunctionalityList(
              Class => $ItemData{Class},
          );
          my $FunctionalityOptionStrg = $Self->{LayoutObject}->BuildSelection(
!             Name         => 'Functionality',
!             Data         => $FunctionalityRef,
!             PossibleNone => 1,
!             SelectedID   => $ItemData{Functionality} || '',
!             Translation  => 0,
          );
  
--- 180,205 ----
          );
  
!         # get functionality list
          my $FunctionalityRef = $Self->{GeneralCatalogObject}->FunctionalityList(
              Class => $ItemData{Class},
          );
+ 
+         # prepare functionality list
+         my %FunctionalityList;
+         for my $Functionality ( @{$FunctionalityRef} ) {
+             $FunctionalityList{$Functionality} = $Functionality || '-';
+         }
+         if ( !%FunctionalityList ) {
+             %FunctionalityList = (
+                 '' => '-',
+             );
+         }
+ 
+         # generate FunctionalityOptionStrg
          my $FunctionalityOptionStrg = $Self->{LayoutObject}->BuildSelection(
!             Name        => 'Functionality',
!             Data        => \%FunctionalityList,
!             SelectedID  => $ItemData{Functionality} || '',
!             Translation => 0,
          );
  
***************
*** 301,305 ****
          $Self->{LayoutObject}->Block(
              Name => 'OverviewClass',
!             Data => {%Param},
          );
  
--- 322,328 ----
          $Self->{LayoutObject}->Block(
              Name => 'OverviewClass',
!             Data => {
!                 %Param,
!             },
          );