From ed066caf580630c476fe4918a00e5d88e8784441 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Fri, 14 Aug 2020 17:09:58 +0000 Subject: [PATCH] Bug 26015: Terminology: Fix tons more staff clients to staff interfaces This takes care of more occurences of staff client and changes it to staff interface, including in code comments. To test: - I think in this case careful code review is what we look for. Signed-off-by: Jonathan Druart Signed-off-by: Nick Clemens Signed-off-by: Jonathan Druart --- C4/Search.pm | 2 +- Koha/Filter/MARC/ViewPolicy.pm | 2 +- .../Elasticsearch/QueryBuilder.pm | 4 +- admin/preferences.pl | 2 +- admin/systempreferences.pl | 2 +- api/v1/swagger/definitions/patron.json | 2 +- debian/docs/koha-create.xml | 2 +- debian/templates/koha-conf-site.xml.in | 2 +- installer/data/mysql/kohastructure.sql | 18 ++++---- installer/data/mysql/sysprefs.sql | 42 +++++++++---------- installer/data/mysql/userflags.sql | 2 +- .../searchengine/elasticsearch/mappings.tt | 2 +- misc/load_testing/benchmark_circulation.pl | 2 +- misc/load_testing/benchmark_staff.pl | 2 +- t/db_dependent/selenium/authentication.t | 2 +- t/db_dependent/www/auth_values_input_www.t | 2 +- t/db_dependent/www/batch.t | 4 +- t/db_dependent/www/search_utf8.t | 2 +- 18 files changed, 48 insertions(+), 48 deletions(-) diff --git a/C4/Search.pm b/C4/Search.pm index bd4953e67b..56b7991a04 100644 --- a/C4/Search.pm +++ b/C4/Search.pm @@ -1375,7 +1375,7 @@ sub buildQuery { # Add index-specific attributes - #Afaik, this 'yr' condition will only ever be met in the staff client advanced search + #Afaik, this 'yr' condition will only ever be met in the staff interface advanced search #for "Publication date", since typing 'yr:YYYY' into the search box produces a CCL query, #which is processed higher up in this sub. Other than that, year searches are typically #handled as limits which are not processed her either. diff --git a/Koha/Filter/MARC/ViewPolicy.pm b/Koha/Filter/MARC/ViewPolicy.pm index a963e3f129..1b7ef7468c 100644 --- a/Koha/Filter/MARC/ViewPolicy.pm +++ b/Koha/Filter/MARC/ViewPolicy.pm @@ -273,7 +273,7 @@ sub should_hide_marc { =head1 CONFIGURATION AND ENVIRONMENT -Install Koha. This filter will be used appropriately by the OPAC or Staff client. +Install Koha. This filter will be used appropriately by the OPAC or staff interface. =head1 INCOMPATIBILITIES diff --git a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm b/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm index 8e2adf8136..779d793c15 100644 --- a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm +++ b/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm @@ -1112,7 +1112,7 @@ sub _split_query { Generate a list of searchable fields to be used for Elasticsearch queries applied to multiple fields. -Returns an arrayref of field names for either OPAC or Staff client, with +Returns an arrayref of field names for either OPAC or staff interface, with possible weights and subfield appended to each field name depending on the options provided. @@ -1121,7 +1121,7 @@ options provided. =item C<$params> Hashref with options. The parameter C indicates whether the searchable -fields for OPAC or Staff client should be retrieved. If C is set +fields for OPAC or staff interface should be retrieved. If C is set fields weights will be applied on returned fields. C can be used to provide a subfield that will be appended to fields as "C.C". diff --git a/admin/preferences.pl b/admin/preferences.pl index c5fd6ebb8f..480e5415b5 100755 --- a/admin/preferences.pl +++ b/admin/preferences.pl @@ -84,7 +84,7 @@ sub _get_chunk { $interface = 'opac'; $theme = C4::Context->preference('opacthemes'); } else { - # this is the staff client + # this is the staff interface $interface = 'intranet'; $theme = C4::Context->preference('template'); } diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl index 32a5c93782..15faac54c0 100755 --- a/admin/systempreferences.pl +++ b/admin/systempreferences.pl @@ -182,7 +182,7 @@ sub GetPrefParams { $theme = C4::Context->preference('opacthemes'); } else { - # this is the staff client + # this is the staff interface $interface = 'intranet'; $theme = C4::Context->preference('template'); } diff --git a/api/v1/swagger/definitions/patron.json b/api/v1/swagger/definitions/patron.json index a4f998c04d..827702385b 100644 --- a/api/v1/swagger/definitions/patron.json +++ b/api/v1/swagger/definitions/patron.json @@ -177,7 +177,7 @@ }, "opac_notes": { "type": ["string", "null"], - "description": "a note on the patron's account visible in OPAC and staff client" + "description": "a note on the patron's account visible in OPAC and staff interface" }, "altaddress_notes": { "type": ["string", "null"], diff --git a/debian/docs/koha-create.xml b/debian/docs/koha-create.xml index f37eb206cd..44758e5eae 100644 --- a/debian/docs/koha-create.xml +++ b/debian/docs/koha-create.xml @@ -224,7 +224,7 @@ koha-create creates a new Koha instance. It is meant for a site that provides Koha hosting, and serves several sites from the same host. The name of the instance is used as the domain name for Apache, Unix user and group names, and MySQL username and database names are derived from it. Unix user and group are named instance-koha. MySQL username is koha_instance, and database is koha_instance. The Unix user has logins disabled. The password for MySQL is generated randomly, and printed to the terminal. - The instance name is used as the domain name (ServerName) for Apache. The public catalogue (OPAC), for library customers, is on port 80. The staff client interface is configured similarly, depending on the settings in /etc/koha/koha-sites.conf or alternate config file. + The instance name is used as the domain name (ServerName) for Apache. The public catalogue (OPAC), for library customers, is on port 80. The staff interface is configured similarly, depending on the settings in /etc/koha/koha-sites.conf or alternate config file. After the Koha instance is created, it is ready to be used, but the librarian needs to log in via the intranet and configure things. Several configuration variables are available for adjusting this behavior. The variables are put into /etc/koha/koha-sites.conf. The following variables are obeyed: diff --git a/debian/templates/koha-conf-site.xml.in b/debian/templates/koha-conf-site.xml.in index 182e964c99..b02204d85c 100644 --- a/debian/templates/koha-conf-site.xml.in +++ b/debian/templates/koha-conf-site.xml.in @@ -318,7 +318,7 @@ __END_SRU_PUBLICSERVER__ __API_SECRET__ - +