[otrs-cvs] CVS: ITSMCMDB/Kernel/Modules AgentITSMCMDB.pm,1.43,1.44

[cvs-log at otrs.org]

Update of /home/cvs/ITSMCMDB/Kernel/Modules
In directory lancelot:/tmp/cvs-serv16234/Kernel/Modules

Modified Files:
	AgentITSMCMDB.pm 
Log Message:
moved regexp and require check to core module

Index: AgentITSMCMDB.pm
===================================================================
RCS file: /home/cvs/ITSMCMDB/Kernel/Modules/AgentITSMCMDB.pm,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** AgentITSMCMDB.pm	4 Nov 2006 16:36:11 -0000	1.43
--- AgentITSMCMDB.pm	6 Nov 2006 15:40:26 -0000	1.44
***************
*** 338,352 ****
              );
          }
  
!         my $Redirect = "Action=$Self->{Action}&Subaction=RecordEdit&ConfigItem=$ConfigItem&RecordID=$RecordID";
! 
!         if ($Self->{ParamObject}->GetParam(Param => "SubmitSave")) {
!             $Redirect = "Action=$Self->{Action}&Subaction=RecordView&ConfigItem=$ConfigItem&RecordID=$RecordID";
          }
  
!         # redirect
!         return $Self->{LayoutObject}->Redirect(
!             OP => $Redirect,
!         );
      }
  
--- 338,368 ----
              );
          }
+         # check if required or regexp is invalid
+         my $Invalid = 0;
  
!         my $DataArray = $Self->{ITSMCMDBObject}->DataArrayGet(
!             ConfigItem => $ConfigItem,
!             RecordID => $RecordID,
!             UserID => 1,
!         );
!         foreach my $Item (@{$DataArray}) {
!             if ($Item->{Invalid}) {
!                 $Invalid = 1;
!             }
          }
  
!         # redirect to edit if required or regexp is invalid
!         if ($Self->{ParamObject}->GetParam(Param => "SubmitSave") && !$Invalid) {
!             # redirect
!             return $Self->{LayoutObject}->Redirect(
!                 OP => "Action=$Self->{Action}&Subaction=RecordView&ConfigItem=$ConfigItem&RecordID=$RecordID",
!             );
!         }
!         else {
!             # redirect
!             return $Self->{LayoutObject}->Redirect(
!                 OP => "Action=$Self->{Action}&Subaction=RecordEdit&ConfigItem=$ConfigItem&RecordID=$RecordID",
!             );
!         }
      }
  
***************
*** 907,910 ****
--- 923,928 ----
                  Name => $Attribute->{Name},
                  Required => $Attribute->{Input}->{Required} || '',
+                 RequiredInvalid => $Attribute->{Input}->{RequiredInvalid} || '',
+                 RegExpInvalid => $Attribute->{Input}->{RegExpInvalid} || '',
                  InputField => $InputField,
                  ButtonDelete => $Attribute->{ButtonDelete},
***************
*** 933,936 ****
--- 951,956 ----
                          Name => $Sub1->{Name},
                          Required => $Sub1->{Input}->{Required} || '',
+                         RequiredInvalid => $Sub1->{Input}->{RequiredInvalid} || '',
+                         RegExpInvalid => $Sub1->{Input}->{RegExpInvalid} || '',
                          InputField => $InputField,
                          ButtonDelete => $Sub1->{ButtonDelete},
***************
*** 960,963 ****
--- 980,985 ----
                                  Name => $Sub2->{Name},
                                  Required => $Sub2->{Input}->{Required} || '',
+                                 RequiredInvalid => $Sub2->{Input}->{RequiredInvalid} || '',
+                                 RegExpInvalid => $Sub2->{Input}->{RegExpInvalid} || '',
                                  InputField => $InputField,
                                  ButtonDelete => $Sub2->{ButtonDelete},