Attachment #109142 for bug #26015

View | Details | Raw Unified | Return to bug 26015
Collapse All | Expand All

Lines 1375-1381 sub buildQuery { Link Here

(-)a/C4/Search.pm (-1 / +1 lines)
1375		1375
1376	# Add index-specific attributes	1376	# Add index-specific attributes
1377		1377
1378	#Afaik, this 'yr' condition will only ever be met in the staff client advanced search	1378	#Afaik, this 'yr' condition will only ever be met in the staff interface advanced search
1379	#for "Publication date", since typing 'yr:YYYY' into the search box produces a CCL query,	1379	#for "Publication date", since typing 'yr:YYYY' into the search box produces a CCL query,
1380	#which is processed higher up in this sub. Other than that, year searches are typically	1380	#which is processed higher up in this sub. Other than that, year searches are typically
1381	#handled as limits which are not processed her either.	1381	#handled as limits which are not processed her either.

Lines 273-279 sub should_hide_marc { Link Here

(-)a/Koha/Filter/MARC/ViewPolicy.pm (-1 / +1 lines)
273		273
274	=head1 CONFIGURATION AND ENVIRONMENT	274	=head1 CONFIGURATION AND ENVIRONMENT
275		275
276	Install Koha. This filter will be used appropriately by the OPAC or Staff client.	276	Install Koha. This filter will be used appropriately by the OPAC or staff interface.
277		277
278	=head1 INCOMPATIBILITIES	278	=head1 INCOMPATIBILITIES
279		279

Lines 1112-1118 sub _split_query { Link Here

(-)a/Koha/SearchEngine/Elasticsearch/QueryBuilder.pm (-2 / +2 lines)
1112	Generate a list of searchable fields to be used for Elasticsearch queries	1112	Generate a list of searchable fields to be used for Elasticsearch queries
1113	applied to multiple fields.	1113	applied to multiple fields.
1114		1114
1115	Returns an arrayref of field names for either OPAC or Staff client, with	1115	Returns an arrayref of field names for either OPAC or staff interface, with
1116	possible weights and subfield appended to each field name depending on the	1116	possible weights and subfield appended to each field name depending on the
1117	options provided.	1117	options provided.
1118		1118
Lines 1121-1127 options provided. Link Here
1121	=item C<$params>	1121	=item C<$params>
1122		1122
1123	Hashref with options. The parameter C<is_opac> indicates whether the searchable	1123	Hashref with options. The parameter C<is_opac> indicates whether the searchable
1124	fields for OPAC or Staff client should be retrieved. If C<weighted_fields> is set	1124	fields for OPAC or staff interface should be retrieved. If C<weighted_fields> is set
1125	fields weights will be applied on returned fields. C<subfield> can be used to	1125	fields weights will be applied on returned fields. C<subfield> can be used to
1126	provide a subfield that will be appended to fields as "C<field_name>.C<subfield>".	1126	provide a subfield that will be appended to fields as "C<field_name>.C<subfield>".
1127		1127

Lines 84-90 sub _get_chunk { Link Here

(-)a/admin/preferences.pl (-1 / +1 lines)
84	$interface = 'opac';	84	$interface = 'opac';
85	$theme = C4::Context->preference('opacthemes');	85	$theme = C4::Context->preference('opacthemes');
86	} else {	86	} else {
87	# this is the staff client	87	# this is the staff interface
88	$interface = 'intranet';	88	$interface = 'intranet';
89	$theme = C4::Context->preference('template');	89	$theme = C4::Context->preference('template');
90	}	90	}

Lines 182-188 sub GetPrefParams { Link Here

(-)a/admin/systempreferences.pl (-1 / +1 lines)
182	$theme = C4::Context->preference('opacthemes');	182	$theme = C4::Context->preference('opacthemes');
183	} else {	183	} else {
184		184
185	# this is the staff client	185	# this is the staff interface
186	$interface = 'intranet';	186	$interface = 'intranet';
187	$theme = C4::Context->preference('template');	187	$theme = C4::Context->preference('template');
188	}	188	}

Lines 177-183 Link Here

(-)a/api/v1/swagger/definitions/patron.json (-1 / +1 lines)
177	},	177	},
178	"opac_notes": {	178	"opac_notes": {
179	"type": ["string", "null"],	179	"type": ["string", "null"],
180	"description": "a note on the patron's account visible in OPAC and staff client"	180	"description": "a note on the patron's account visible in OPAC and staff interface"
181	},	181	},
182	"altaddress_notes": {	182	"altaddress_notes": {
183	"type": ["string", "null"],	183	"type": ["string", "null"],

Lines 224-230 Link Here

(-)a/debian/docs/koha-create.xml (-1 / +1 lines)
224	<para><command>koha-create</command> creates a new Koha instance. It is meant for a site that provides Koha hosting, and serves several sites from the same host.</para>	224	<para><command>koha-create</command> creates a new Koha instance. It is meant for a site that provides Koha hosting, and serves several sites from the same host.</para>
225	<para>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.</para>	225	<para>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.</para>
226	<para>The Unix user has logins disabled. The password for MySQL is generated randomly, and printed to the terminal.</para>	226	<para>The Unix user has logins disabled. The password for MySQL is generated randomly, and printed to the terminal.</para>
227	<para>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 <filename>/etc/koha/koha-sites.conf</filename> or alternate config file.</para>	227	<para>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 <filename>/etc/koha/koha-sites.conf</filename> or alternate config file.</para>
228	<para>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.</para>	228	<para>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.</para>
229	<para>Several configuration variables are available for adjusting this behavior. The variables are put into <filename>/etc/koha/koha-sites.conf</filename>. The following variables are obeyed:</para>	229	<para>Several configuration variables are available for adjusting this behavior. The variables are put into <filename>/etc/koha/koha-sites.conf</filename>. The following variables are obeyed:</para>
230		230

Lines 318-324 __END_SRU_PUBLICSERVER__ Link Here

(-)a/debian/templates/koha-conf-site.xml.in (-1 / +1 lines)
318	<!-- Secret passphrase used by Mojolicious for signed cookies -->	318	<!-- Secret passphrase used by Mojolicious for signed cookies -->
319	<api_secret_passphrase>__API_SECRET__</api_secret_passphrase>	319	<api_secret_passphrase>__API_SECRET__</api_secret_passphrase>
320		320
321	<!-- Accessible directory from the staff client, uncomment the following line and define a valid path to let the intranet user access it-->	321	<!-- Accessible directory from the staff interface, uncomment the following line and define a valid path to let the intranet user access it-->
322	<!--	322	<!--
323	<access_dirs>	323	<access_dirs>
324	<access_dir></access_dir>	324	<access_dir></access_dir>




  `id` int(11) NOT NULL auto_increment, -- unique key, used to identify the authorized value
  `category` varchar(32) NOT NULL default '', -- key used to identify the authorized value category
  `authorised_value` varchar(80) NOT NULL default '', -- code use to identify the authorized value
  `lib` varchar(200) default NULL, -- authorized value description as printed in the staff interface
  `lib_opac` varchar(200) default NULL, -- authorized value description as printed in the OPAC
  `imageurl` varchar(200) default NULL, -- authorized value URL
  PRIMARY KEY  (`id`),

  `unique_id` tinyint(1) NOT NULL default 0, -- defines if this value needs to be unique (1 for yes, 0 for no)
  `opac_display` tinyint(1) NOT NULL default 0, -- defines if this field is visible to patrons on their account in the OPAC (1 for yes, 0 for no)
  `opac_editable` tinyint(1) NOT NULL default 0, -- defines if this field is editable by patrons on their account in the OPAC (1 for yes, 0 for no)
  `staff_searchable` tinyint(1) NOT NULL default 0, -- defines if this field is searchable via the patron search in the staff interface (1 for yes, 0 for no)
  `authorised_value_category` varchar(32) default NULL, -- foreign key from authorised_values that links this custom field to an authorized value category
  `display_checkout` tinyint(1) NOT NULL default 0,-- defines if this field displays in checkout screens
  `category_code` VARCHAR(10) NULL DEFAULT NULL,-- defines a category for an attribute_type

  `contactname` LONGTEXT, -- used for children and profesionals to include surname or last name of guarantor or organization name
  `contactfirstname` MEDIUMTEXT, -- used for children to include first name of guarantor
  `contacttitle` MEDIUMTEXT, -- used for children to include title (Mr., Mrs., etc) of guarantor
  `borrowernotes` LONGTEXT, -- a note on the patron/borrower's account that is only visible in the staff interface
  `relationship` varchar(100) default NULL, -- used for children to include the relationship to their guarantor
  `sex` varchar(1) default NULL, -- patron/borrower's gender
  `password` varchar(60) default NULL, -- patron/borrower's encrypted password
  `flags` int(11) default NULL, -- will include a number associated with the staff member's permissions
  `userid` varchar(75) default NULL, -- patron/borrower's opac and/or staff interface log in
  `opacnote` LONGTEXT, -- a note on the patron/borrower's account that is visible in the OPAC and staff interface
  `contactnote` varchar(255) default NULL, -- a note related to the patron/borrower's alternate address
  `sort1` varchar(80) default NULL, -- a field that can be used for any information unique to the library
  `sort2` varchar(80) default NULL, -- a field that can be used for any information unique to the library

  `contactname` LONGTEXT, -- used for children and profesionals to include surname or last name of guarantor or organization name
  `contactfirstname` MEDIUMTEXT, -- used for children to include first name of guarantor
  `contacttitle` MEDIUMTEXT, -- used for children to include title (Mr., Mrs., etc) of guarantor
  `borrowernotes` LONGTEXT, -- a note on the patron/borrower's account that is only visible in the staff interface
  `relationship` varchar(100) default NULL, -- used for children to include the relationship to their guarantor
  `sex` varchar(1) default NULL, -- patron/borrower's gender
  `password` varchar(60) default NULL, -- patron/borrower's Bcrypt encrypted password
  `flags` int(11) default NULL, -- will include a number associated with the staff member's permissions
  `userid` varchar(75) default NULL, -- patron/borrower's opac and/or staff interface log in
  `opacnote` LONGTEXT, -- a note on the patron/borrower's account that is visible in the OPAC and staff interface
  `contactnote` varchar(255) default NULL, -- a note related to the patron/borrower's alternate address
  `sort1` varchar(80) default NULL, -- a field that can be used for any information unique to the library
  `sort2` varchar(80) default NULL, -- a field that can be used for any information unique to the library

  `branchcode` varchar(10) default NULL, -- branch code users to create branch specific news, NULL is every branch.
  `title` varchar(250) NOT NULL default '', -- title of the news article
  `content` MEDIUMTEXT NOT NULL, -- the body of your news article
  `lang` varchar(50) NOT NULL default '', -- location for the article (koha is the staff interface, slip is the circulation receipt and language codes are for the opac)
  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, -- pulibcation date and time
  `expirationdate` date default NULL, -- date the article is set to expire or no longer be visible
  `number` int(11) default NULL, -- the order in which this article appears in that specific location




('AlternateHoldingsField','',NULL,'The MARC field/subfield that contains alternate holdings information for bibs taht do not have items attached (e.g. 852abchi for libraries converting from MARC Magician).','free'),
('AlternateHoldingsSeparator','',NULL,'The string to use to separate subfields in alternate holdings displays.','free'),
('AmazonAssocTag','','','See:  http://aws.amazon.com','free'),
('AmazonCoverImages','0','','Display Cover Images in staff interface from Amazon Web Services','YesNo'),
('AmazonLocale','US','US|CA|DE|FR|IN|JP|UK','Use to set the Locale of your Amazon.com Web Services','Choice'),
('AnonSuggestions','0',NULL,'Set to enable Anonymous suggestions to AnonymousPatron borrowernumber','YesNo'),
('AnonymousPatron','0',NULL,'Set the identifier (borrowernumber) of the anonymous patron. Used for Suggestion and reading history privacy',''),

('AutoEmailOpacUser','0',NULL,'Sends notification emails containing new account details to patrons - when account is created.','YesNo'),
('AutoEmailPrimaryAddress','OFF','email|emailpro|B_email|cardnumber|OFF','Defines the default email address where \'Account Details\' emails are sent.','Choice'),
('AutoShareWithMana','subscription','','defines datas automatically shared with mana','multiple'),
('AutoLocation','0',NULL,'If ON, IP authentication is enabled, blocking access to the staff interface from unauthorized IP addresses','YesNo'),
('AutomaticItemReturn','1',NULL,'If ON, Koha will automatically set up a transfer of this item to its homebranch','YesNo'),
('autoMemberNum','0','','If ON, patron number is auto-calculated','YesNo'),
('AutoRemoveOverduesRestrictions','0',NULL,'Defines whether an OVERDUES debarment should be lifted automatically if all overdue items are returned by the patron.','YesNo'),

('BorrowersTitles','Mr|Mrs|Miss|Ms',NULL,'Define appropriate Titles for patrons','free'),
('BorrowerUnwantedField','',NULL,'Name the fields you don\'t need to store for a patron\'s account','free'),
('BranchTransferLimitsType','ccode','itemtype|ccode','When using branch transfer limits, choose whether to limit by itemtype or collection code.','Choice'),
('BrowseResultSelection','0',NULL,'Enable/Disable browsing search results fromt the bibliographic record detail page in staff interface','YesNo'),
('CalculateFinesOnReturn','1','','Switch to control if overdue fines are calculated on return or not','YesNo'),
('CalculateFinesOnBackdate','1','','Switch to control if overdue fines are calculated on return when backdating','YesNo'),
('CalendarFirstDayOfWeek','0','0|1|2|3|4|5|6','Select the first day of week to use in the calendar.','Choice'),

('CronjobLog','0',NULL,'If ON, log information from cron jobs.','YesNo'),
('CumulativeRestrictionPeriods',0,NULL,'Cumulate the restriction periods instead of keeping the highest','YesNo'),
('CurrencyFormat','US','US|FR|CH','Determines the display format of currencies. eg: \'36000\' is displayed as \'360 000,00\'  in \'FR\' or \'360,000.00\'  in \'US\'.','Choice'),
('CustomCoverImages','0',NULL,'If enabled, the custom cover images will be displayed in the staff interface. CustomCoverImagesURL must be defined.','YesNo'),
('CustomCoverImagesURL','',NULL,'Define an URL serving book cover images, using the following patterns: %issn%, %isbn%, FIXME ADD MORE (use it with CustomCoverImages and/or OPACCustomCoverImages)','free'),
('dateformat','us','metric|us|iso|dmydot','Define global date format (us mm/dd/yyyy, metric dd/mm/yyy, ISO yyyy-mm-dd, dmydot dd.mm.yyyy)','Choice'),
('DebugLevel','2','0|1|2','Define the level of debugging information sent to the browser when errors are encountered (set to 0 in production). 0=none, 1=some, 2=most','Choice'),

('DefaultToLoggedInLibraryNoticesSlips',  '0', NULL ,  'If enabled,slips and notices editor will default to the logged in library''s rules, rather than the ''all libraries'' rules.',  'YesNo'),
('DefaultToLoggedInLibraryOverdueTriggers',  '0', NULL ,  'If enabled, overdue status triggers editor will default to the logged in library''s rules, rather than the ''default'' rules.',  'YesNo'),
('delimiter',';',';|tabulation|,|/|\\|#||','Define the default separator character for exporting reports','Choice'),
('Display856uAsImage','OFF','OFF|Details|Results|Both','Display the URI in the 856u field as an image, the corresponding staff interface XSLT option must be on','Choice'),
('DisplayClearScreenButton','0','','If set to ON, a clear screen button will appear on the circulation page.','YesNo'),
('displayFacetCount','0',NULL,NULL,'YesNo'),
('DisplayIconsXSLT','1','','If ON, displays the format, audience, and material type icons in XSLT MARC21 results and detail pages.','YesNo'),

('HoldsAutoFillPrintSlip','0',NULL,'If on, hold slip print dialog will be displayed automatically','YesNo'),
('HoldsLog','0',NULL,'If ON, log create/cancel/suspend/resume actions on holds.','YesNo'),
('HoldsQueueSkipClosed', '0', NULL, 'If enabled, any libraries that are closed when the holds queue is built will be ignored for the purpose of filling holds.', 'YesNo'),
('HoldsSplitQueue','nothing','nothing|branch|itemtype|branch_itemtype','In the staff interface, split the holds view by the given criteria','Choice'),
('HoldsToPullStartDate','2',NULL,'Set the default start date for the Holds to pull list to this many days ago','Integer'),
('HomeOrHoldingBranch','holdingbranch','holdingbranch|homebranch','Used by Circulation to determine which branch of an item to check with independent branches on, and by search to determine which branch to choose for availability ','Choice'),
('HouseboundModule',0,'','If ON, enable housebound module functionality.','YesNo'),

('IntranetBiblioDefaultView','normal','normal|marc|isbd|labeled_marc','Choose the default detail view in the staff interface; choose between normal, labeled_marc, marc or isbd','Choice'),
('intranetbookbag','1','','If ON, enables display of Cart feature in the intranet','YesNo'),
('IntranetCirculationHomeHTML', '', NULL, 'Show the following HTML in a div on the bottom of the reports home page', 'Free'),
('IntranetCoce','0', NULL, 'If on, enables cover retrieval from the configured Coce server in the staff interface', 'YesNo'),
('intranetcolorstylesheet','','50','Define the color stylesheet to use in the staff interface','free'),
('IntranetFavicon','','','Enter a complete URL to an image to replace the default Koha favicon on the staff interface','free'),
('IntranetmainUserblock','','70|10','Add a block of HTML that will display on the intranet home page','Textarea'),
('IntranetNav','','70|10','Use HTML tabs to add navigational links to the top-hand navigational bar in the staff interface','Textarea'),
('IntranetNumbersPreferPhrase','0',NULL,'Control the use of phr operator in callnumber and standard number staff interface searches','YesNo'),
('intranetreadinghistory','1','','If ON, Reading History is enabled for all patrons','YesNo'),
('IntranetReportsHomeHTML', '', NULL, 'Show the following HTML in a div on the bottom of the reports home page', 'Free'),
('IntranetSlipPrinterJS','','','Use this JavaScript for printing slips. Define at least function printThenClose(). For use e.g. with Firefox PlugIn jsPrintSetup, see http://jsprintsetup.mozdev.org/','Free'),

('KohaManualBaseURL','https://koha-community.org/manual/','','Where is the Koha manual/documentation located?','Free'),
('KohaManualLanguage','en','en|ar|cs|de|es|fr|it|pt_BR|tr|zh_TW','What is the language of the online manual you want to use?','Choice'),
('LabelMARCView','standard','standard|economical','Define how a MARC record will display','Choice'),
('language','en',NULL,'Set the default language in the staff interface.','Languages'),
('LetterLog','1',NULL,'If ON, log all notices sent','YesNo'),
('LibraryName','','','Define the library name as displayed on the OPAC',''),
('LibraryThingForLibrariesEnabled','0','','Enable or Disable Library Thing for Libraries Features','YesNo'),

('NovelistSelectEnabled','0',NULL,'Enable Novelist Select content.  Requires Novelist Profile and Password','YesNo'),
('NovelistSelectPassword','',NULL,'Novelist select user Password','free'),
('NovelistSelectProfile','',NULL,'Novelist Select user Profile','free'),
('NovelistSelectStaffEnabled','0',NULL,'Enable Novelist Select content in the staff interface.  Requires Novelist Profile and Password','YesNo'),
('NovelistSelectStaffProfile','',NULL,'Novelist Select user Profile for staff interface','free'),
('NovelistSelectStaffView','tab','tab|above|below','Where to display Novelist Select content in the staff interface','Choice'),
('NovelistSelectView','tab','tab|above|below|right','Where to display Novelist Select content','Choice'),
('NumberOfSuggestionDays','',NULL,'Number of days that will be used to determine the MaxTotalSuggestions limit','Free'),
('numReturnedItemsToShow','20',NULL,'Number of returned items to show on the check-in page','Integer'),
('NumSavedReports', '20', NULL, 'By default, show this number of saved reports.', 'Integer'),
('numSearchResults','20',NULL,'Specify the maximum number of results to display on a page of results','Integer'),
('numSearchResultsDropdown', 0, NULL, 'Enable option list of number of results per page to show in staff interface search results','YesNo'),
('numSearchRSSResults','50',NULL,'Specify the maximum number of results to display on a RSS page of results','Integer'),
('OAI-PMH','0',NULL,'if ON, OAI-PMH server is enabled','YesNo'),
('OAI-PMH:archiveID','KOHA-OAI-TEST',NULL,'OAI-PMH archive identification','Free'),

('PatronAnonymizeDelay','',NULL,'Delay for anonymizing patrons', 'Integer'),
('PatronAutoComplete','1','Try|Don\'t try','to guess the patron being entered while typing a patron search for circulation or patron search. Only returns the first 10 results at a time.','YesNo'),
('PatronDuplicateMatchingAddFields','surname|firstname|dateofbirth', NULL,'A list of fields separated by "|" to deduplicate patrons when created','Free'),
('patronimages','0',NULL,'Enable patron images for the staff interface','YesNo'),
('PatronRemovalDelay','',NULL,'Delay for removing anonymized patrons', 'Integer'),
('PatronSelfModificationBorrowerUnwantedField','',NULL,'Name the fields you don\'t want to display when a patron is editing their information via the OPAC.','free'),
('PatronSelfRegistration','0',NULL,'If enabled, patrons will be able to register themselves via the OPAC.','YesNo'),

('SpineLabelAutoPrint','0','','If this setting is turned on, a print dialog will automatically pop up for the quick spine label printer.','YesNo'),
('SpineLabelFormat','<itemcallnumber><copynumber>','30|10','This preference defines the format for the quick spine label printer. Just list the fields you would like to see in the order you would like to see them, surrounded by <>, for example <itemcallnumber>.','Textarea'),
('SpineLabelShowPrintOnBibDetails','0','','If turned on, a \"Print label\" link will appear for each item on the bib details page in the staff interface.','YesNo'),
('staffClientBaseURL','',NULL,'Specify the base URL of the staff interface starting with http:// or https://. Do not include a trailing slash in the URL. (This must be filled in correctly for CAS, svc, and load_testing to work.)','free'),
('StaffDetailItemSelection', '1', NULL, 'Enable item selection in record detail page', 'YesNo'),
('StaffLangSelectorMode','footer','top|both|footer','Select the location to display the language selector in staff interface','Choice'),
('StaffLoginInstructions', '', NULL, 'HTML to go into the login box for the staff interface','Free'),
('StaffSearchResultsDisplayBranch','holdingbranch','holdingbranch|homebranch','Controls the display of the home or holding branch for staff search results','Choice'),
('StaffSerialIssueDisplayCount','3','','Number of serial issues to display per subscription in the staff interface','Integer'),
('StaticHoldsQueueWeight','0',NULL,'Specify a list of library location codes separated by commas -- the list of codes will be traversed and weighted with first values given higher weight for holds fulfillment -- alternatively, if RandomizeHoldsQueueWeight is set, the list will be randomly selective','Integer'),
('StatisticsFields','location|itype|ccode', NULL, 'Define Fields (from the items table) used for statistics members','Free'),
('StockRotation','0',NULL,'If ON, enables the stock rotation module','YesNo'),

Lines 1-7 Link Here

(-)a/installer/data/mysql/userflags.sql (-1 / +1 lines)
1	INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES	1	INSERT INTO userflags (bit, flag, flagdesc, defaulton) VALUES
2	(0,'superlibrarian','Access to all librarian functions',0),	2	(0,'superlibrarian','Access to all librarian functions',0),
3	(1,'circulate','Check out and check in items',0),	3	(1,'circulate','Check out and check in items',0),
4	(2,'catalogue','<b>Required for staff login.</b> Staff access, allows viewing of catalogue in staff client.',0),	4	(2,'catalogue','<b>Required for staff login.</b> Staff access, allows viewing of catalogue in staff interface.',0),
5	(3,'parameters','Manage Koha system settings (Administration panel)',0),	5	(3,'parameters','Manage Koha system settings (Administration panel)',0),
6	(4,'borrowers','Add or modify patrons',0),	6	(4,'borrowers','Add or modify patrons',0),
7	(5,'permissions','Set user permissions',0),	7	(5,'permissions','Set user permissions',0),

Lines 169-175 a.add, a.delete { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/searchengine/elasticsearch/mappings.tt (-1 / +1 lines)
169	</tr>	169	</tr>
170	<tr>	170	<tr>
171	<th colspan=3> </th>	171	<th colspan=3> </th>
172	<th>Staff client</th>	172	<th>Staff interface</th>
173	<th>OPAC</th>	173	<th>OPAC</th>
174	<th> </th>	174	<th> </th>
175	</tr>	175	</tr>

Lines 72-78 print "--------------\n"; Link Here

(-)a/misc/load_testing/benchmark_circulation.pl (-1 / +1 lines)
72	print "Koha circulation benchmarking utility\n";	72	print "Koha circulation benchmarking utility\n";
73	print "--------------\n";	73	print "--------------\n";
74	print "Benchmarking with $max_tries occurrences of each operation and $concurrency concurrent sessions \n";	74	print "Benchmarking with $max_tries occurrences of each operation and $concurrency concurrent sessions \n";
75	print "Load testing staff client dashboard page";	75	print "Load testing staff interface dashboard page";
76	for (my $i=1;$i<=$max_tries;$i++) {	76	for (my $i=1;$i<=$max_tries;$i++) {
77	push @mainpage,"$baseurl/mainpage.pl";	77	push @mainpage,"$baseurl/mainpage.pl";
78	}	78	}

Lines 154-160 if ($steps=~ /1/) { Link Here

(-)a/misc/load_testing/benchmark_staff.pl (-1 / +1 lines)
154	my $b0 = HTTPD::Bench::ApacheBench->new;	154	my $b0 = HTTPD::Bench::ApacheBench->new;
155	$b0->concurrency( $concurrency ); my @mainpage;	155	$b0->concurrency( $concurrency ); my @mainpage;
156	unless ($short_print) {	156	unless ($short_print) {
157	print "Step 1: staff client main page ";	157	print "Step 1: staff interface main page ";
158	}	158	}
159	for (my $i=1;$i<=$max_tries;$i++) {	159	for (my $i=1;$i<=$max_tries;$i++) {
160	push @mainpage,"$baseurl/mainpage.pl";	160	push @mainpage,"$baseurl/mainpage.pl";

Lines 59-65 SKIP: { Link Here

(-)a/t/db_dependent/selenium/authentication.t (-1 / +1 lines)
59	$driver->get($mainpage . q\|?logout.x=1\|);	59	$driver->get($mainpage . q\|?logout.x=1\|);
60	$patron->flags(4)->store; # catalogue permission	60	$patron->flags(4)->store; # catalogue permission
61	$s->auth( $patron->userid, $password );	61	$s->auth( $patron->userid, $password );
62	like( $driver->get_title, qr(Koha staff client), 'Patron with flags catalogue should be able to login' );	62	like( $driver->get_title, qr(Koha staff interface), 'Patron with flags catalogue should be able to login' );
63		63
64	$driver->get($mainpage . q\|?logout.x=1\|);	64	$driver->get($mainpage . q\|?logout.x=1\|);
65	like( $driver->get_title(), qr(Log in to Koha), 'If logout is requested, login form should be displayed' );	65	like( $driver->get_title(), qr(Log in to Koha), 'If logout is requested, login form should be displayed' );

Lines 67-73 $agent->form_name('loginform'); Link Here

(-)a/t/db_dependent/www/auth_values_input_www.t (-1 / +1 lines)
67	$agent->field( 'password', $password );	67	$agent->field( 'password', $password );
68	$agent->field( 'userid', $user );	68	$agent->field( 'userid', $user );
69	$agent->field( 'branch', '' );	69	$agent->field( 'branch', '' );
70	$agent->click_ok( '', 'login to staff client' );	70	$agent->click_ok( '', 'login to staff interface' );
71	$agent->get_ok( "$intranet/cgi-bin/koha/mainpage.pl", 'load main page' );	71	$agent->get_ok( "$intranet/cgi-bin/koha/mainpage.pl", 'load main page' );
72		72
73	#---------------------------------------- Test with corean, greek and emoji chars	73	#---------------------------------------- Test with corean, greek and emoji chars

Lines 48-54 my $intranet = $ENV{KOHA_INTRANET_URL}; Link Here

(-)a/t/db_dependent/www/batch.t (-2 / +2 lines)
48	if (not defined $intranet) {	48	if (not defined $intranet) {
49	plan skip_all =>	49	plan skip_all =>
50	"You must set the environment variable KOHA_INTRANET_URL to ".	50	"You must set the environment variable KOHA_INTRANET_URL to ".
51	"point this test to your staff client. If you do not have ".	51	"point this test to your staff interface. If you do not have ".
52	"KOHA_CONF set, you must also set KOHA_USER and KOHA_PASS for ".	52	"KOHA_CONF set, you must also set KOHA_USER and KOHA_PASS for ".
53	"your username and password";	53	"your username and password";
54	}	54	}
Lines 66-72 $agent->form_name('loginform'); Link Here
66	$agent->field( 'password', $password );	66	$agent->field( 'password', $password );
67	$agent->field( 'userid', $user );	67	$agent->field( 'userid', $user );
68	$agent->field( 'branch', '' );	68	$agent->field( 'branch', '' );
69	$agent->click_ok( '', 'login to staff client' );	69	$agent->click_ok( '', 'login to staff interface' );
70		70
71	$agent->get_ok( "$intranet/cgi-bin/koha/mainpage.pl", 'load main page' );	71	$agent->get_ok( "$intranet/cgi-bin/koha/mainpage.pl", 'load main page' );
72		72

Lines 138-144 sub test_search{ Link Here

(-)a/t/db_dependent/www/search_utf8.t (-2 / +1 lines)
138	$agent->field( 'password', $password );	138	$agent->field( 'password', $password );
139	$agent->field( 'userid', $user );	139	$agent->field( 'userid', $user );
140	$agent->field( 'branch', '' );	140	$agent->field( 'branch', '' );
141	$agent->click_ok( '', 'login to staff client' );	141	$agent->click_ok( '', 'login to staff interface' );
142		142
143	$agent->get_ok( "$intranet/cgi-bin/koha/mainpage.pl", 'load main page' );	143	$agent->get_ok( "$intranet/cgi-bin/koha/mainpage.pl", 'load main page' );
144		144
145	-

Return to bug 26015

Lines 113-119 CREATE TABLE `authorised_values` ( -- stores values for authorized values catego Link Here

(-)a/installer/data/mysql/kohastructure.sql (-9 / +9 lines)
113	`id` int(11) NOT NULL auto_increment, -- unique key, used to identify the authorized value	113	`id` int(11) NOT NULL auto_increment, -- unique key, used to identify the authorized value
114	`category` varchar(32) NOT NULL default '', -- key used to identify the authorized value category	114	`category` varchar(32) NOT NULL default '', -- key used to identify the authorized value category
115	`authorised_value` varchar(80) NOT NULL default '', -- code use to identify the authorized value	115	`authorised_value` varchar(80) NOT NULL default '', -- code use to identify the authorized value
116	`lib` varchar(200) default NULL, -- authorized value description as printed in the staff client	116	`lib` varchar(200) default NULL, -- authorized value description as printed in the staff interface
117	`lib_opac` varchar(200) default NULL, -- authorized value description as printed in the OPAC	117	`lib_opac` varchar(200) default NULL, -- authorized value description as printed in the OPAC
118	`imageurl` varchar(200) default NULL, -- authorized value URL	118	`imageurl` varchar(200) default NULL, -- authorized value URL
119	PRIMARY KEY (`id`),	119	PRIMARY KEY (`id`),
Lines 223-229 CREATE TABLE `borrower_attribute_types` ( -- definitions for custom patron field Link Here
223	`unique_id` tinyint(1) NOT NULL default 0, -- defines if this value needs to be unique (1 for yes, 0 for no)	223	`unique_id` tinyint(1) NOT NULL default 0, -- defines if this value needs to be unique (1 for yes, 0 for no)
224	`opac_display` tinyint(1) NOT NULL default 0, -- defines if this field is visible to patrons on their account in the OPAC (1 for yes, 0 for no)	224	`opac_display` tinyint(1) NOT NULL default 0, -- defines if this field is visible to patrons on their account in the OPAC (1 for yes, 0 for no)
225	`opac_editable` tinyint(1) NOT NULL default 0, -- defines if this field is editable by patrons on their account in the OPAC (1 for yes, 0 for no)	225	`opac_editable` tinyint(1) NOT NULL default 0, -- defines if this field is editable by patrons on their account in the OPAC (1 for yes, 0 for no)
226	`staff_searchable` tinyint(1) NOT NULL default 0, -- defines if this field is searchable via the patron search in the staff client (1 for yes, 0 for no)	226	`staff_searchable` tinyint(1) NOT NULL default 0, -- defines if this field is searchable via the patron search in the staff interface (1 for yes, 0 for no)
227	`authorised_value_category` varchar(32) default NULL, -- foreign key from authorised_values that links this custom field to an authorized value category	227	`authorised_value_category` varchar(32) default NULL, -- foreign key from authorised_values that links this custom field to an authorized value category
228	`display_checkout` tinyint(1) NOT NULL default 0,-- defines if this field displays in checkout screens	228	`display_checkout` tinyint(1) NOT NULL default 0,-- defines if this field displays in checkout screens
229	`category_code` VARCHAR(10) NULL DEFAULT NULL,-- defines a category for an attribute_type	229	`category_code` VARCHAR(10) NULL DEFAULT NULL,-- defines a category for an attribute_type
Lines 576-588 CREATE TABLE `deletedborrowers` ( -- stores data related to the patrons/borrower Link Here
576	`contactname` LONGTEXT, -- used for children and profesionals to include surname or last name of guarantor or organization name	576	`contactname` LONGTEXT, -- used for children and profesionals to include surname or last name of guarantor or organization name
577	`contactfirstname` MEDIUMTEXT, -- used for children to include first name of guarantor	577	`contactfirstname` MEDIUMTEXT, -- used for children to include first name of guarantor
578	`contacttitle` MEDIUMTEXT, -- used for children to include title (Mr., Mrs., etc) of guarantor	578	`contacttitle` MEDIUMTEXT, -- used for children to include title (Mr., Mrs., etc) of guarantor
579	`borrowernotes` LONGTEXT, -- a note on the patron/borrower's account that is only visible in the staff client	579	`borrowernotes` LONGTEXT, -- a note on the patron/borrower's account that is only visible in the staff interface
580	`relationship` varchar(100) default NULL, -- used for children to include the relationship to their guarantor	580	`relationship` varchar(100) default NULL, -- used for children to include the relationship to their guarantor
581	`sex` varchar(1) default NULL, -- patron/borrower's gender	581	`sex` varchar(1) default NULL, -- patron/borrower's gender
582	`password` varchar(60) default NULL, -- patron/borrower's encrypted password	582	`password` varchar(60) default NULL, -- patron/borrower's encrypted password
583	`flags` int(11) default NULL, -- will include a number associated with the staff member's permissions	583	`flags` int(11) default NULL, -- will include a number associated with the staff member's permissions
584	`userid` varchar(75) default NULL, -- patron/borrower's opac and/or staff client log in	584	`userid` varchar(75) default NULL, -- patron/borrower's opac and/or staff interface log in
585	`opacnote` LONGTEXT, -- a note on the patron/borrower's account that is visible in the OPAC and staff client	585	`opacnote` LONGTEXT, -- a note on the patron/borrower's account that is visible in the OPAC and staff interface
586	`contactnote` varchar(255) default NULL, -- a note related to the patron/borrower's alternate address	586	`contactnote` varchar(255) default NULL, -- a note related to the patron/borrower's alternate address
587	`sort1` varchar(80) default NULL, -- a field that can be used for any information unique to the library	587	`sort1` varchar(80) default NULL, -- a field that can be used for any information unique to the library
588	`sort2` varchar(80) default NULL, -- a field that can be used for any information unique to the library	588	`sort2` varchar(80) default NULL, -- a field that can be used for any information unique to the library
Lines 1502-1514 CREATE TABLE `borrowers` ( -- this table includes information about your patrons Link Here
1502	`contactname` LONGTEXT, -- used for children and profesionals to include surname or last name of guarantor or organization name	1502	`contactname` LONGTEXT, -- used for children and profesionals to include surname or last name of guarantor or organization name
1503	`contactfirstname` MEDIUMTEXT, -- used for children to include first name of guarantor	1503	`contactfirstname` MEDIUMTEXT, -- used for children to include first name of guarantor
1504	`contacttitle` MEDIUMTEXT, -- used for children to include title (Mr., Mrs., etc) of guarantor	1504	`contacttitle` MEDIUMTEXT, -- used for children to include title (Mr., Mrs., etc) of guarantor
1505	`borrowernotes` LONGTEXT, -- a note on the patron/borrower's account that is only visible in the staff client	1505	`borrowernotes` LONGTEXT, -- a note on the patron/borrower's account that is only visible in the staff interface
1506	`relationship` varchar(100) default NULL, -- used for children to include the relationship to their guarantor	1506	`relationship` varchar(100) default NULL, -- used for children to include the relationship to their guarantor
1507	`sex` varchar(1) default NULL, -- patron/borrower's gender	1507	`sex` varchar(1) default NULL, -- patron/borrower's gender
1508	`password` varchar(60) default NULL, -- patron/borrower's Bcrypt encrypted password	1508	`password` varchar(60) default NULL, -- patron/borrower's Bcrypt encrypted password
1509	`flags` int(11) default NULL, -- will include a number associated with the staff member's permissions	1509	`flags` int(11) default NULL, -- will include a number associated with the staff member's permissions
1510	`userid` varchar(75) default NULL, -- patron/borrower's opac and/or staff client log in	1510	`userid` varchar(75) default NULL, -- patron/borrower's opac and/or staff interface log in
1511	`opacnote` LONGTEXT, -- a note on the patron/borrower's account that is visible in the OPAC and staff client	1511	`opacnote` LONGTEXT, -- a note on the patron/borrower's account that is visible in the OPAC and staff interface
1512	`contactnote` varchar(255) default NULL, -- a note related to the patron/borrower's alternate address	1512	`contactnote` varchar(255) default NULL, -- a note related to the patron/borrower's alternate address
1513	`sort1` varchar(80) default NULL, -- a field that can be used for any information unique to the library	1513	`sort1` varchar(80) default NULL, -- a field that can be used for any information unique to the library
1514	`sort2` varchar(80) default NULL, -- a field that can be used for any information unique to the library	1514	`sort2` varchar(80) default NULL, -- a field that can be used for any information unique to the library
Lines 1722-1728 CREATE TABLE `opac_news` ( -- data from the news tool Link Here
1722	`branchcode` varchar(10) default NULL, -- branch code users to create branch specific news, NULL is every branch.	1722	`branchcode` varchar(10) default NULL, -- branch code users to create branch specific news, NULL is every branch.
1723	`title` varchar(250) NOT NULL default '', -- title of the news article	1723	`title` varchar(250) NOT NULL default '', -- title of the news article
1724	`content` MEDIUMTEXT NOT NULL, -- the body of your news article	1724	`content` MEDIUMTEXT NOT NULL, -- the body of your news article
1725	`lang` varchar(50) NOT NULL default '', -- location for the article (koha is the staff client, slip is the circulation receipt and language codes are for the opac)	1725	`lang` varchar(50) NOT NULL default '', -- location for the article (koha is the staff interface, slip is the circulation receipt and language codes are for the opac)
1726	`timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, -- pulibcation date and time	1726	`timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP, -- pulibcation date and time
1727	`expirationdate` date default NULL, -- date the article is set to expire or no longer be visible	1727	`expirationdate` date default NULL, -- date the article is set to expire or no longer be visible
1728	`number` int(11) default NULL, -- the order in which this article appears in that specific location	1728	`number` int(11) default NULL, -- the order in which this article appears in that specific location