[otrs-cvs] Artefact/Kernel/Modules AgentArtefact.pm,1.17,1.18
cvs-log at otrs.org
cvs-log at otrs.org
Wed Feb 6 11:17:18 GMT 2008
Comments:
Update of /home/cvs/Artefact/Kernel/Modules
In directory lancelot:/tmp/cvs-serv2688/Kernel/Modules
Modified Files:
AgentArtefact.pm
Log Message:
Improved the code quality.
Author: tr
Index: AgentArtefact.pm
===================================================================
RCS file: /home/cvs/Artefact/Kernel/Modules/AgentArtefact.pm,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** AgentArtefact.pm 6 Feb 2008 10:57:48 -0000 1.17
--- AgentArtefact.pm 6 Feb 2008 11:17:13 -0000 1.18
***************
*** 56,60 ****
# ---------------------------------------------------------- #
if ( $Self->{Subaction} eq 'Add' ) {
- my $Output = '';
my %Frontend = ();
--- 56,59 ----
***************
*** 77,87 ****
# build output
! $Output .= $Self->{LayoutObject}->Header( Title => "Add" );
! $Output .= $Self->{LayoutObject}->NavigationBar();
! $Output .= $Self->{LayoutObject}->Output(
Data => { %Param, %Frontend },
TemplateFile => 'AgentArtefact',
);
! $Output .= $Self->{LayoutObject}->Footer();
return $Output;
}
--- 76,86 ----
# build output
! my $Output .= $Self->{LayoutObject}->Header( Title => "Add" );
! $Output .= $Self->{LayoutObject}->NavigationBar();
! $Output .= $Self->{LayoutObject}->Output(
Data => { %Param, %Frontend },
TemplateFile => 'AgentArtefact',
);
! $Output .= $Self->{LayoutObject}->Footer();
return $Output;
}
***************
*** 91,96 ****
# ---------------------------------------------------------- #
elsif ( $Self->{Subaction} eq 'AddAction' ) {
- my %UploadStuff = ();
- my $ArtefactID = '';
my %Param = ();
for (qw(Title Filename FileMD5 Description TypeID UserIDs)) {
--- 90,93 ----
***************
*** 104,108 ****
# get submit attachment
! %UploadStuff = $Self->{ParamObject}->GetUploadAll(
Param => 'file_upload',
Source => 'String',
--- 101,105 ----
# get submit attachment
! my %UploadStuff = $Self->{ParamObject}->GetUploadAll(
Param => 'file_upload',
Source => 'String',
***************
*** 112,116 ****
}
! $ArtefactID = $Self->{ArtefactObject}->ArtefactAdd( %Param, %UploadStuff, );
if ($ArtefactID) {
--- 109,113 ----
}
! my $ArtefactID = $Self->{ArtefactObject}->ArtefactAdd( %Param, %UploadStuff, );
if ($ArtefactID) {
***************
*** 127,133 ****
# ---------------------------------------------------------- #
elsif ( $Self->{Subaction} eq 'Update' ) {
- my $Output = '';
my %Frontend = ();
- my %Artefact = ();
my $ArtefactID = $Self->{ParamObject}->GetParam( Param => 'ArtefactID' );
--- 124,128 ----
***************
*** 138,142 ****
# get artefact
! %Artefact = $Self->{ArtefactObject}->ArtefactGet( ArtefactID => $ArtefactID );
if ( !%Artefact ) {
return $Self->{LayoutObject}->ErrorScreen();
--- 133,137 ----
# get artefact
! my %Artefact = $Self->{ArtefactObject}->ArtefactGet( ArtefactID => $ArtefactID );
if ( !%Artefact ) {
return $Self->{LayoutObject}->ErrorScreen();
***************
*** 155,165 ****
# build output
! $Output .= $Self->{LayoutObject}->Header( Title => "Edit" );
! $Output .= $Self->{LayoutObject}->NavigationBar();
! $Output .= $Self->{LayoutObject}->Output(
TemplateFile => 'AgentArtefact',
Data => { %Param, %Frontend },
);
! $Output .= $Self->{LayoutObject}->Footer();
return $Output;
}
--- 150,160 ----
# build output
! my $Output .= $Self->{LayoutObject}->Header( Title => "Edit" );
! $Output .= $Self->{LayoutObject}->NavigationBar();
! $Output .= $Self->{LayoutObject}->Output(
TemplateFile => 'AgentArtefact',
Data => { %Param, %Frontend },
);
! $Output .= $Self->{LayoutObject}->Footer();
return $Output;
}
***************
*** 169,173 ****
# ---------------------------------------------------------- #
elsif ( $Self->{Subaction} eq 'UpdateAction' ) {
- my %UploadStuff = ();
my %GetParam = ();
for (qw(ArtefactID Number Title Filename FileMD5 Description TypeID UserIDs)) {
--- 164,167 ----
***************
*** 181,185 ****
# get submit attachment
! %UploadStuff = $Self->{ParamObject}->GetUploadAll(
Param => 'file_upload',
Source => 'String',
--- 175,179 ----
# get submit attachment
! my %UploadStuff = $Self->{ParamObject}->GetUploadAll(
Param => 'file_upload',
Source => 'String',
***************
*** 198,203 ****
# ---------------------------------------------------------- #
elsif ( $Self->{Subaction} eq 'Delete' ) {
- my $Output = '';
- my %Artefact = ();
my $ArtefactID = $Self->{ParamObject}->GetParam( Param => 'ArtefactID' );
--- 192,195 ----
***************
*** 208,212 ****
# get artefact
! %Artefact = $Self->{ArtefactObject}->ArtefactGet( ArtefactID => $ArtefactID );
if ( !%Artefact ) {
return $Self->{LayoutObject}->ErrorScreen();
--- 200,204 ----
# get artefact
! my %Artefact = $Self->{ArtefactObject}->ArtefactGet( ArtefactID => $ArtefactID );
if ( !%Artefact ) {
return $Self->{LayoutObject}->ErrorScreen();
***************
*** 218,228 ****
# build output
! $Output .= $Self->{LayoutObject}->Header( Title => "Delete" );
! $Output .= $Self->{LayoutObject}->NavigationBar();
! $Output .= $Self->{LayoutObject}->Output(
TemplateFile => 'AgentArtefact',
Data => {%Param},
);
! $Output .= $Self->{LayoutObject}->Footer();
return $Output;
}
--- 210,220 ----
# build output
! my $Output .= $Self->{LayoutObject}->Header( Title => "Delete" );
! $Output .= $Self->{LayoutObject}->NavigationBar();
! $Output .= $Self->{LayoutObject}->Output(
TemplateFile => 'AgentArtefact',
Data => {%Param},
);
! $Output .= $Self->{LayoutObject}->Footer();
return $Output;
}
***************
*** 250,257 ****
# ---------------------------------------------------------- #
elsif ( $Self->{Subaction} eq 'View' ) {
- my $Output = '';
my %Frontend = ();
- my %Links = ();
- my %ShownUsers = ();
# get artefact
--- 242,246 ----
***************
*** 270,274 ****
# user lookup
! %ShownUsers = $Self->{UserObject}->UserList(
Type => 'Long',
Valid => 0,
--- 259,263 ----
# user lookup
! my %ShownUsers = $Self->{UserObject}->UserList(
Type => 'Long',
Valid => 0,
***************
*** 301,305 ****
# link lookup
! %Links = $Self->{LinkObject}->AllLinkedObjects(
Object => 'Artefact',
ObjectID => $ArtefactID,
--- 290,294 ----
# link lookup
! my %Links = $Self->{LinkObject}->AllLinkedObjects(
Object => 'Artefact',
ObjectID => $ArtefactID,
***************
*** 320,330 ****
# build output
! $Output .= $Self->{LayoutObject}->Header( Title => "View" );
! $Output .= $Self->{LayoutObject}->NavigationBar();
! $Output .= $Self->{LayoutObject}->Output(
! Data => {%Param},
TemplateFile => 'AgentArtefact',
);
! $Output .= $Self->{LayoutObject}->Footer();
return $Output;
}
--- 309,319 ----
# build output
! my $Output .= $Self->{LayoutObject}->Header( Title => "View" );
! $Output .= $Self->{LayoutObject}->NavigationBar();
! $Output .= $Self->{LayoutObject}->Output(
! Data => \%Param,
TemplateFile => 'AgentArtefact',
);
! $Output .= $Self->{LayoutObject}->Footer();
return $Output;
}
***************
*** 334,341 ****
# ---------------------------------------------------------- #
elsif ( $Self->{Subaction} eq 'Print' ) {
- my $Output = '';
my %Frontend = ();
- my %Links = ();
- my %ShownUsers = ();
# get artefact
--- 323,327 ----
***************
*** 347,351 ****
# user lookup
! %ShownUsers = $Self->{UserObject}->UserList(
Type => 'Long',
Valid => 0,
--- 333,337 ----
# user lookup
! my %ShownUsers = $Self->{UserObject}->UserList(
Type => 'Long',
Valid => 0,
***************
*** 359,363 ****
# link lookup
! %Links = $Self->{LinkObject}->AllLinkedObjects(
Object => 'Artefact',
ObjectID => $ArtefactID,
--- 345,349 ----
# link lookup
! my %Links = $Self->{LinkObject}->AllLinkedObjects(
Object => 'Artefact',
ObjectID => $ArtefactID,
***************
*** 378,387 ****
# build output
! $Output .= $Self->{LayoutObject}->PrintHeader( Title => "Print" );
! $Output .= $Self->{LayoutObject}->Output(
TemplateFile => 'AgentArtefact',
! Data => {%Param},
);
! $Output .= $Self->{LayoutObject}->PrintFooter();
return $Output;
}
--- 364,373 ----
# build output
! my $Output .= $Self->{LayoutObject}->PrintHeader( Title => 'Print' );
! $Output .= $Self->{LayoutObject}->Output(
TemplateFile => 'AgentArtefact',
! Data => \%Param,
);
! $Output .= $Self->{LayoutObject}->PrintFooter();
return $Output;
}
***************
*** 405,412 ****
# ---------------------------------------------------------- #
elsif ( $Self->{Subaction} eq 'Search' ) {
- my $Output = '';
my %Frontend = ();
- my %Links = ();
- my %ShownUsers = ();
my ( $Sec, $Min, $Hour, $Day, $Month, $Year )
--- 391,395 ----
***************
*** 465,475 ****
# build output
! $Output .= $Self->{LayoutObject}->Header( Title => "Search" );
! $Output .= $Self->{LayoutObject}->NavigationBar();
! $Output .= $Self->{LayoutObject}->Output(
TemplateFile => 'AgentArtefact',
Data => { %Param, %Frontend },
);
! $Output .= $Self->{LayoutObject}->Footer();
return $Output;
}
--- 448,458 ----
# build output
! my $Output .= $Self->{LayoutObject}->Header( Title => 'Search' );
! $Output .= $Self->{LayoutObject}->NavigationBar();
! $Output .= $Self->{LayoutObject}->Output(
TemplateFile => 'AgentArtefact',
Data => { %Param, %Frontend },
);
! $Output .= $Self->{LayoutObject}->Footer();
return $Output;
}
***************
*** 479,485 ****
# ---------------------------------------------------------- #
elsif ( $Self->{Subaction} eq 'SearchAction' ) {
- my $Output = '';
- my %Frontend = ();
- my @ArtefactIDs = ();
# get search params
--- 462,465 ----
***************
*** 548,555 ****
# artefact search
! @ArtefactIDs = $Self->{ArtefactObject}->ArtefactSearch(%Param);
# build search navigation bar
! %Frontend = $Self->{LayoutObject}->PageNavBar(
Limit => $Self->{SearchLimit},
StartHit => $Self->{StartHit},
--- 528,535 ----
# artefact search
! my @ArtefactIDs = $Self->{ArtefactObject}->ArtefactSearch(%Param);
# build search navigation bar
! my %Frontend = $Self->{LayoutObject}->PageNavBar(
Limit => $Self->{SearchLimit},
StartHit => $Self->{StartHit},
***************
*** 586,596 ****
# build output
! $Output .= $Self->{LayoutObject}->Header( Title => "Search" );
! $Output .= $Self->{LayoutObject}->NavigationBar();
! $Output .= $Self->{LayoutObject}->Output(
TemplateFile => 'AgentArtefact',
Data => {%Param},
);
! $Output .= $Self->{LayoutObject}->Footer();
return $Output;
}
--- 566,576 ----
# build output
! my $Output .= $Self->{LayoutObject}->Header( Title => "Search" );
! $Output .= $Self->{LayoutObject}->NavigationBar();
! $Output .= $Self->{LayoutObject}->Output(
TemplateFile => 'AgentArtefact',
Data => {%Param},
);
! $Output .= $Self->{LayoutObject}->Footer();
return $Output;
}
More information about the cvs-log
mailing list