[otrs-cvs] CVS: ITSMCMDB/Kernel/Modules AgentITSMCMDB.pm,1.44,1.45
cvs-log at otrs.org
cvs-log at otrs.org
Tue Nov 7 14:32:00 CET 2006
Update of /home/cvs/ITSMCMDB/Kernel/Modules
In directory lancelot:/tmp/cvs-serv9296/Kernel/Modules
Modified Files:
AgentITSMCMDB.pm
Log Message:
added object as attribute feature
Index: AgentITSMCMDB.pm
===================================================================
RCS file: /home/cvs/ITSMCMDB/Kernel/Modules/AgentITSMCMDB.pm,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -r1.44 -r1.45
*** AgentITSMCMDB.pm 6 Nov 2006 15:40:26 -0000 1.44
--- AgentITSMCMDB.pm 7 Nov 2006 13:31:57 -0000 1.45
***************
*** 922,925 ****
--- 922,926 ----
Mode => $Param{Mode},
Name => $Attribute->{Name},
+ Description => $Attribute->{Description} || '',
Required => $Attribute->{Input}->{Required} || '',
RequiredInvalid => $Attribute->{Input}->{RequiredInvalid} || '',
***************
*** 950,953 ****
--- 951,955 ----
Hierachy => 1,
Name => $Sub1->{Name},
+ Description => $Sub1->{Description} || '',
Required => $Sub1->{Input}->{Required} || '',
RequiredInvalid => $Sub1->{Input}->{RequiredInvalid} || '',
***************
*** 979,982 ****
--- 981,985 ----
Hierachy => 2,
Name => $Sub2->{Name},
+ Description => $Sub2->{Description} || '',
Required => $Sub2->{Input}->{Required} || '',
RequiredInvalid => $Sub2->{Input}->{RequiredInvalid} || '',
***************
*** 1097,1104 ****
}
elsif ($Attribute->{Input}->{Type} eq 'Select') {
$Return = $Self->{LayoutObject}->OptionStrgHashRef(
Name => ${$Attribute->{Input}}{Name},
! SelectedID => ${$Attribute->{Input}}{Value},
! Data => \%{$Attribute->{Input}->{Data}},
);
}
--- 1100,1140 ----
}
elsif ($Attribute->{Input}->{Type} eq 'Select') {
+ my %Data = ();
+ my $SelectedID = '';
+ if (!$Attribute->{Input}->{Object}) {
+ %Data = %{$Attribute->{Input}->{Data}};
+ $SelectedID = ${$Attribute->{Input}}{Value};
+ }
+ else {
+ # get overview attribute
+ my @AttributeOverview = $Self->{ITSMCMDBObject}->AttributeOverviewList(
+ ConfigItem => $Attribute->{Input}->{Object},
+ );
+ my @KeyList = $Self->{ITSMCMDBObject}->RecordList(
+ ConfigItem => $Attribute->{Input}->{Object},
+ UserID => $Self->{UserID},
+ );
+ if (!$Attribute->{Input}->{Required}) {
+ $Data{''} = '-';
+ }
+ foreach my $RecordID (@KeyList) {
+ my $Value = '';
+ foreach (@AttributeOverview) {
+ # output table header
+ my $AttributeValue = $Self->{ITSMCMDBObject}->AttributeValueGet(
+ ConfigItem => $Attribute->{Input}->{Object},
+ RecordID => $RecordID,
+ Attribute => $_,
+ );
+ $Value .= " $AttributeValue";
+ }
+ $Data{$RecordID} = $Value;
+ }
+ $SelectedID = ${$Attribute->{Input}}{ValueID} || '';
+ }
$Return = $Self->{LayoutObject}->OptionStrgHashRef(
Name => ${$Attribute->{Input}}{Name},
! SelectedID => $SelectedID,
! Data => \%Data,
);
}
***************
*** 1219,1226 ****
if ($Param{Name}) {
if ($Param{Required}) {
! $Param{Name} = "\$Text{\"$Param{Name}\"}: <font color=\"blue\" title=\"\$Text{\"required\"}\">*</font>";
}
else {
! $Param{Name} = "\$Text{\"$Param{Name}\"}: ";
}
}
--- 1255,1262 ----
if ($Param{Name}) {
if ($Param{Required}) {
! $Param{Name} = "<div title=\"$Param{Description}\">\$Text{\"$Param{Name}\"}: <font color=\"blue\" title=\"\$Text{\"required\"}\">*</font></div> ";
}
else {
! $Param{Name} = "<div title=\"$Param{Description}\">\$Text{\"$Param{Name}\"}:</div> ";
}
}
***************
*** 1478,1480 ****
}
! 1;
\ No newline at end of file
--- 1514,1516 ----
}
! 1;
More information about the cvs-log
mailing list