[otrs-cvs] CVS: ITSMCMDB/Kernel/Modules AgentITSMCMDB.pm,1.40,1.41

[cvs-log at otrs.org]

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

Modified Files:
	AgentITSMCMDB.pm 
Log Message:
added init version of RegExp and Required feature of elements

Index: AgentITSMCMDB.pm
===================================================================
RCS file: /home/cvs/ITSMCMDB/Kernel/Modules/AgentITSMCMDB.pm,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** AgentITSMCMDB.pm	3 Nov 2006 09:13:51 -0000	1.40
--- AgentITSMCMDB.pm	3 Nov 2006 13:33:08 -0000	1.41
***************
*** 853,856 ****
--- 853,857 ----
                  Mode => $Param{Mode},
                  Name => $Attribute->{Name},
+                 Required => $Attribute->{Input}->{Required} || '',
                  InputField => $InputField,
                  ButtonDelete => $Attribute->{ButtonDelete},
***************
*** 878,881 ****
--- 879,883 ----
                          Hierachy => 1,
                          Name => $Sub1->{Name},
+                         Required => $Sub1->{Input}->{Required} || '',
                          InputField => $InputField,
                          ButtonDelete => $Sub1->{ButtonDelete},
***************
*** 904,907 ****
--- 906,910 ----
                                  Hierachy => 2,
                                  Name => $Sub2->{Name},
+                                 Required => $Sub2->{Input}->{Required} || '',
                                  InputField => $InputField,
                                  ButtonDelete => $Sub2->{ButtonDelete},
***************
*** 1028,1032 ****
              my $ExpandCustomerName1 = '';
              my $ExpandCustomerName2 = '';
!             if ($Attribute->{Input}->{Value} =~ /(.*)::(ExpandCustomerName(1|2))/) {
                  $Attribute->{Input}->{Value} = $1;
                  if ($3 == 1) {
--- 1031,1035 ----
              my $ExpandCustomerName1 = '';
              my $ExpandCustomerName2 = '';
!             if ($Attribute->{Input}->{Value} && $Attribute->{Input}->{Value} =~ /(.*)::(ExpandCustomerName(1|2))/) {
                  $Attribute->{Input}->{Value} = $1;
                  if ($3 == 1) {
***************
*** 1099,1104 ****
                      UserLogin => $Attribute->{Input}->{Value},
                  );
              }
-             $Return = "$Realname (${$Attribute->{Input}}{Value})" || '';
          }
          else {
--- 1102,1110 ----
                      UserLogin => $Attribute->{Input}->{Value},
                  );
+                 $Return = "$Realname (${$Attribute->{Input}}{Value})" || '';
+             }
+             else {
+                 $Return = '';
              }
          }
          else {
***************
*** 1137,1141 ****
      # prepare given name
      if ($Param{Name}) {
!         $Param{Name} .= ':';
      }
      else {
--- 1143,1152 ----
      # prepare given name
      if ($Param{Name}) {
!         if ($Param{Required}) {
!             $Param{Name} = "\$Text{\"$Param{Name}\"}: <font color=\"blue\" title=\"\$Text{\"required\"}\">*</font>";
!         }
!         else {
!             $Param{Name} = "\$Text{\"$Param{Name}\"}: ";
!         }
      }
      else {