projects
/
koha_fer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/new/bug_8440'
[koha_fer]
/
admin
/
systempreferences.pl
diff --git
a/admin/systempreferences.pl
b/admin/systempreferences.pl
index
4e72229
..
f7a7d05
100755
(executable)
--- a/
admin/systempreferences.pl
+++ b/
admin/systempreferences.pl
@@
-76,6
+76,7
@@
my %tabsysprefs;
$tabsysprefs{AcqCreateItem}="Acquisitions";
$tabsysprefs{OrderPdfFormat}="Acquisitions";
$tabsysprefs{CurrencyFormat}="Acquisitions";
$tabsysprefs{AcqCreateItem}="Acquisitions";
$tabsysprefs{OrderPdfFormat}="Acquisitions";
$tabsysprefs{CurrencyFormat}="Acquisitions";
+ $tabsysprefs{AcqViewBaskets}="Acquisitions";
# Admin
$tabsysprefs{singleBranchMode} = "Admin";
# Admin
$tabsysprefs{singleBranchMode} = "Admin";
@@
-94,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";
@@
-162,7
+163,6
@@
$tabsysprefs{IssuingInProcess} = "Circulation";
$tabsysprefs{patronimages} = "Circulation";
$tabsysprefs{printcirculationslips} = "Circulation";
$tabsysprefs{ReturnBeforeExpiry} = "Circulation";
$tabsysprefs{patronimages} = "Circulation";
$tabsysprefs{printcirculationslips} = "Circulation";
$tabsysprefs{ReturnBeforeExpiry} = "Circulation";
-$tabsysprefs{ceilingDueDate} = "Circulation";
$tabsysprefs{SpecifyDueDate} = "Circulation";
$tabsysprefs{AutomaticItemReturn} = "Circulation";
$tabsysprefs{ReservesMaxPickUpDelay} = "Circulation";
$tabsysprefs{SpecifyDueDate} = "Circulation";
$tabsysprefs{AutomaticItemReturn} = "Circulation";
$tabsysprefs{ReservesMaxPickUpDelay} = "Circulation";
@@
-175,7
+175,6
@@
$tabsysprefs{canreservefromotherbranches} = "Circulation";
$tabsysprefs{finesMode} = "Circulation";
$tabsysprefs{numReturnedItemsToShow} = "Circulation";
$tabsysprefs{emailLibrarianWhenHoldIsPlaced} = "Circulation";
$tabsysprefs{finesMode} = "Circulation";
$tabsysprefs{numReturnedItemsToShow} = "Circulation";
$tabsysprefs{emailLibrarianWhenHoldIsPlaced} = "Circulation";
-$tabsysprefs{globalDueDate} = "Circulation";
$tabsysprefs{itemBarcodeInputFilter} = "Circulation";
$tabsysprefs{WebBasedSelfCheck} = "Circulation";
$tabsysprefs{ShowPatronImageInWebBasedSelfCheck} = "Circulation";
$tabsysprefs{itemBarcodeInputFilter} = "Circulation";
$tabsysprefs{WebBasedSelfCheck} = "Circulation";
$tabsysprefs{ShowPatronImageInWebBasedSelfCheck} = "Circulation";
@@
-225,6
+224,7
@@
$tabsysprefs{intranetreadinghistory} = "Patrons";
$tabsysprefs{NotifyBorrowerDeparture} = "Patrons";
$tabsysprefs{memberofinstitution} = "Patrons";
$tabsysprefs{BorrowerMandatoryField} = "Patrons";
$tabsysprefs{NotifyBorrowerDeparture} = "Patrons";
$tabsysprefs{memberofinstitution} = "Patrons";
$tabsysprefs{BorrowerMandatoryField} = "Patrons";
+$tabsysprefs{BorrowerUnwantedField} = "Patrons";
$tabsysprefs{borrowerRelationship} = "Patrons";
$tabsysprefs{BorrowersTitles} = "Patrons";
$tabsysprefs{patronimages} = "Patrons";
$tabsysprefs{borrowerRelationship} = "Patrons";
$tabsysprefs{BorrowersTitles} = "Patrons";
$tabsysprefs{patronimages} = "Patrons";
@@
-266,18
+266,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
+327,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
+339,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";
@@
-592,7
+583,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
+684,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
+736,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