projects
/
koha_fer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 8913 [Revised] Improve acquisitions navigation
[koha_fer]
/
admin
/
systempreferences.pl
diff --git
a/admin/systempreferences.pl
b/admin/systempreferences.pl
index
f4069ae
..
af91041
100755
(executable)
--- a/
admin/systempreferences.pl
+++ b/
admin/systempreferences.pl
@@
-95,7
+95,7
@@
$tabsysprefs{AutoLocation} = "Admin";
$tabsysprefs{DebugLevel} = "Admin";
$tabsysprefs{SessionStorage} = "Admin";
$tabsysprefs{DebugLevel} = "Admin";
$tabsysprefs{SessionStorage} = "Admin";
-# This script is depr
i
cated so all of these prefs are lumped here to avoid their being displayed in the local use prefs tab
+# This script is depr
e
cated so all of these prefs are lumped here to avoid their being displayed in the local use prefs tab
$tabsysprefs{noItemTypeImages} = "Admin";
$tabsysprefs{OPACBaseURL} = "Admin";
$tabsysprefs{noItemTypeImages} = "Admin";
$tabsysprefs{OPACBaseURL} = "Admin";
@@
-203,7
+203,8
@@
$tabsysprefs{DisplayClearScreenButton} = "Circulation";
$tabsysprefs{AllowAllMessageDeletion} = "Circulation";
$tabsysprefs{OverdueNoticeBcc} = "Circulation";
$tabsysprefs{OverduesBlockCirc} = "Circulation";
$tabsysprefs{AllowAllMessageDeletion} = "Circulation";
$tabsysprefs{OverdueNoticeBcc} = "Circulation";
$tabsysprefs{OverduesBlockCirc} = "Circulation";
-
+$tabsysprefs{UseTransportCostMatrix} = "Circulation";
+$tabsysprefs{AllowReturnToBranch} = "Circulation";
# Staff Client
$tabsysprefs{template} = "StaffClient";
# Staff Client
$tabsysprefs{template} = "StaffClient";
@@
-266,18
+267,10
@@
$tabsysprefs{AdvancedSearchTypes} = "Searching";
$tabsysprefs{DisplayMultiPlaceHold} = "Searching";
# EnhancedContent
$tabsysprefs{DisplayMultiPlaceHold} = "Searching";
# EnhancedContent
-$tabsysprefs{AmazonEnabled} = "EnhancedContent";
-$tabsysprefs{OPACAmazonEnabled} = "EnhancedContent";
$tabsysprefs{AmazonCoverImages} = "EnhancedContent";
$tabsysprefs{OPACAmazonCoverImages} = "EnhancedContent";
$tabsysprefs{AmazonCoverImages} = "EnhancedContent";
$tabsysprefs{OPACAmazonCoverImages} = "EnhancedContent";
-$tabsysprefs{AWSAccessKeyID} = "EnhancedContent";
-$tabsysprefs{AWSPrivateKey} = "EnhancedContent";
$tabsysprefs{AmazonLocale} = "EnhancedContent";
$tabsysprefs{AmazonAssocTag} = "EnhancedContent";
$tabsysprefs{AmazonLocale} = "EnhancedContent";
$tabsysprefs{AmazonAssocTag} = "EnhancedContent";
-$tabsysprefs{AmazonSimilarItems} = "EnhancedContent";
-$tabsysprefs{OPACAmazonSimilarItems} = "EnhancedContent";
-$tabsysprefs{AmazonReviews} = "EnhancedContent";
-$tabsysprefs{OPACAmazonReviews} = "EnhancedContent";
# Babelthèque
$tabsysprefs{Babeltheque} = "EnhancedContent";
# Babelthèque
$tabsysprefs{Babeltheque} = "EnhancedContent";
@@
-335,7
+328,6
@@
$tabsysprefs{opaccredits} = "OPAC";
$tabsysprefs{opaclayoutstylesheet} = "OPAC";
$tabsysprefs{OpacNav} = "OPAC";
$tabsysprefs{opacsmallimage} = "OPAC";
$tabsysprefs{opaclayoutstylesheet} = "OPAC";
$tabsysprefs{OpacNav} = "OPAC";
$tabsysprefs{opacsmallimage} = "OPAC";
-$tabsysprefs{opacstylesheet} = "OPAC";
$tabsysprefs{opacthemes} = "OPAC";
$tabsysprefs{opacuserjs} = "OPAC";
$tabsysprefs{opacheader} = "OPAC";
$tabsysprefs{opacthemes} = "OPAC";
$tabsysprefs{opacuserjs} = "OPAC";
$tabsysprefs{opacheader} = "OPAC";
@@
-348,7
+340,7
@@
$tabsysprefs{OPACViewOthersSuggestions} = "OPAC";
$tabsysprefs{URLLinkText} = "OPAC";
$tabsysprefs{OPACSearchForTitleIn} = "OPAC";
$tabsysprefs{OPACShelfBrowser} = "OPAC";
$tabsysprefs{URLLinkText} = "OPAC";
$tabsysprefs{OPACSearchForTitleIn} = "OPAC";
$tabsysprefs{OPACShelfBrowser} = "OPAC";
-$tabsysprefs{OPAC
DisplayRequestPriority}
= "OPAC";
+$tabsysprefs{OPAC
ShowHoldQueueDetails}
= "OPAC";
$tabsysprefs{OPACAllowHoldDateInFuture} = "OPAC";
$tabsysprefs{OPACPatronDetails} = "OPAC";
$tabsysprefs{OPACFinesTab} = "OPAC";
$tabsysprefs{OPACAllowHoldDateInFuture} = "OPAC";
$tabsysprefs{OPACPatronDetails} = "OPAC";
$tabsysprefs{OPACFinesTab} = "OPAC";
@@
-428,8
+420,9
@@
sub StringSearch {
my $sth = $dbh->prepare("Select variable,value,explanation,type,options from systempreferences where (variable like ?) order by variable");
$sth->execute($syspref);
while ( my $data = $sth->fetchrow_hashref ) {
my $sth = $dbh->prepare("Select variable,value,explanation,type,options from systempreferences where (variable like ?) order by variable");
$sth->execute($syspref);
while ( my $data = $sth->fetchrow_hashref ) {
+ unless (defined $data->{value}) { $data->{value} = "";}
$data->{shortvalue} = $data->{value};
$data->{shortvalue} = $data->{value};
- $data->{shortvalue} = substr( $data->{value}, 0, 60 ) . "..." if
defined( $data->{value} ) and
length( $data->{value} ) > 60;
+ $data->{shortvalue} = substr( $data->{value}, 0, 60 ) . "..." if length( $data->{value} ) > 60;
push( @results, $data );
$cnt++;
}
push( @results, $data );
$cnt++;
}
@@
-460,6
+453,7
@@
sub StringSearch {
}
while ( my $data = $sth->fetchrow_hashref ) {
}
while ( my $data = $sth->fetchrow_hashref ) {
+ unless (defined $data->{value}) { $data->{value} = "";}
$data->{shortvalue} = $data->{value};
$data->{shortvalue} = substr( $data->{value}, 0, 60 ) . "..." if length( $data->{value} ) > 60;
push( @results, $data );
$data->{shortvalue} = $data->{value};
$data->{shortvalue} = substr( $data->{value}, 0, 60 ) . "..." if length( $data->{value} ) > 60;
push( @results, $data );
@@
-592,7
+586,7
@@
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
query => $input,
type => "intranet",
authnotrequired => 0,
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => { parameters =>
1
},
+ flagsrequired => { parameters =>
'parameters_remaining_permissions'
},
debug => 1,
}
);
debug => 1,
}
);
@@
-693,9
+687,8
@@
if ( $op eq 'add_form' ) {
}
$data->{'lang'} = $template->param('lang');
}
$data->{'lang'} = $template->param('lang');
-
- $template->param( GetPrefParams($data) );
-
+ my $prefparams = GetPrefParams($data);
+ $template->param( %$prefparams );
$template->param( searchfield => $searchfield );
################## ADD_VALIDATE ##################################
$template->param( searchfield => $searchfield );
################## ADD_VALIDATE ##################################
@@
-746,7
+739,7
@@
if ( $op eq 'add_form' ) {
}
}
$sth->finish;
}
}
$sth->finish;
- print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=systempreferences.pl?tab=
" . $tabsysprefs{ $input->param('variable') } . "
\"></html>";
+ print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=systempreferences.pl?tab=\"></html>";
exit;
################## DELETE_CONFIRM ##################################
# called by default form, used to confirm deletion of data in DB
exit;
################## DELETE_CONFIRM ##################################
# called by default form, used to confirm deletion of data in DB