Bug 7086 : "suggested by" fixed for staff members
Now: - suggested by is stored when a staff member makes a suggestion - managed by is only updated when a suggestion is edited (not when it is created) Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com> Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
This commit is contained in:
parent
b38aec8aae
commit
dc18719e3a
1 changed files with 15 additions and 9 deletions
|
@ -34,20 +34,26 @@ use C4::Debug;
|
||||||
|
|
||||||
sub Init{
|
sub Init{
|
||||||
my $suggestion= shift @_;
|
my $suggestion= shift @_;
|
||||||
foreach my $date ( qw(suggesteddate manageddate) ){
|
# "Managed by" is used only when a suggestion is being edited (not when created)
|
||||||
$suggestion->{$date}=(($suggestion->{$date} eq "0000-00-00" ||$suggestion->{$date} eq "")?
|
if ($suggestion->{'suggesteddate'} eq "0000-00-00" ||$suggestion->{'suggesteddate'} eq "") {
|
||||||
$suggestion->{$date}=C4::Dates->today:
|
# new suggestion
|
||||||
format_date($suggestion->{$date})
|
$suggestion->{'suggesteddate'} = C4::Dates->today;
|
||||||
);
|
$suggestion->{'suggestedby'} = C4::Context->userenv->{"number"} unless ($suggestion->{'suggestedby'});
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
# editing of an existing suggestion
|
||||||
|
$suggestion->{'manageddate'} = C4::Dates->today;
|
||||||
|
warn $suggestion->{'manageddate'};
|
||||||
|
$suggestion->{'managedby'} = C4::Context->userenv->{"number"} unless ($suggestion->{'managedby'});
|
||||||
|
# suggesteddate, when coming from the DB, needs to be formated
|
||||||
|
$suggestion->{'suggesteddate'} = format_date($suggestion->{'suggesteddate'});
|
||||||
}
|
}
|
||||||
foreach my $date ( qw(rejecteddate accepteddate) ){
|
foreach my $date ( qw(rejecteddate accepteddate) ){
|
||||||
$suggestion->{$date}=(($suggestion->{$date} eq "0000-00-00" ||$suggestion->{$date} eq "")?
|
$suggestion->{$date}=(($suggestion->{$date} eq "0000-00-00" ||$suggestion->{$date} eq "")?
|
||||||
"":
|
"":
|
||||||
format_date($suggestion->{$date})
|
format_date($suggestion->{$date})
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
$suggestion->{'managedby'}=C4::Context->userenv->{"number"} unless ($suggestion->{'managedby'});
|
|
||||||
$suggestion->{'createdby'}=C4::Context->userenv->{"number"} unless ($suggestion->{'createdby'});
|
|
||||||
$suggestion->{'branchcode'}=C4::Context->userenv->{"branch"} unless ($suggestion->{'branchcode'});
|
$suggestion->{'branchcode'}=C4::Context->userenv->{"branch"} unless ($suggestion->{'branchcode'});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue