Attachment #118965 for bug #19368

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

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/Bug19368_SortIgnoreArticles.sql (+1 lines)
	1	INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('SortIgnoreArticles','a an the',NULL,'Articles to ignore in when sorting','Free');

Line 1 Link Here

(-)a/installer/data/mysql/atomicupdate/BugUndef-SerialSortIgnoreWords.sql (-1 lines)
1	INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('SerialSortIgnoreWords','',NULL,'Words to ignore in serial search','Free');




[% USE Koha %]
[% USE Asset %]
[% INCLUDE 'format_price.inc' %]
[% Asset.js("lib/datatables/datatables.min.js") | $raw %]
[% Asset.js("lib/jquery/plugins/jquery.dataTables.min.js") | $raw %]
[% Asset.js("lib/jquery/plugins/dataTables.buttons.min.js") | $raw %]
[% Asset.js("lib/jquery/plugins/buttons.colVis.min.js") | $raw %]
[% Asset.js("lib/jquery/plugins/jszip.min.js") | $raw %]
[% Asset.js("lib/jquery/plugins/buttons.print.min.js") | $raw %]
[% Asset.js("lib/jquery/plugins/buttons.html5.min.js") | $raw %]
<script type="text/javascript">
//<![CDATA[
    var MSG_DT_FIRST = _("First");
    var MSG_DT_LAST = _("Last");
    var MSG_DT_NEXT = _("Next");
    var MSG_DT_PREVIOUS = _("Previous");
    var MSG_DT_EMPTY_TABLE = _("No data available in table");
    var MSG_DT_INFO = _("Showing _START_ to _END_ of _TOTAL_");
    var MSG_DT_INFO_EMPTY = _("No entries to show");
    var MSG_DT_INFO_FILTERED = _("(filtered from _MAX_ total entries)");
    var MSG_DT_LENGTH_MENU = _("Show _MENU_ entries");
    var MSG_DT_LOADING_RECORDS = _("Loading...");
    var MSG_DT_PROCESSING = _("Processing...");
    var MSG_DT_SEARCH = _("Search:");
    var MSG_DT_ZERO_RECORDS = _("No matching records found");
    var MSG_DT_ALL = _("All");
    var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = "[% Koha.Preference('SortIgnoreArticles') %]";
    var MSG_DT_COPY_TITLE = _("Copy to clipboard");
    var MSG_DT_COPY_KEYS = _("Press ctrl or ⌘ + C to copy the table data<br>to your system clipboard.<br><br>To cancel, click this message or press escape.");
    var MSG_DT_COPY_SUCCESS_ONE = _("Copied one row to clipboard");
    var MSG_DT_COPY_SUCCESS_X = _("Copied %d rows to clipboard");
//]]>
</script>
[% Asset.js("js/datatables.js") | $raw %]

Lines 87-93 Searching: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref (-1 / +5 lines)
87	0: Disable	87	0: Disable
88	- "the cross_fields option for Elasticsearch searches, supported in Elasticsearch 6.X and above."	88	- "the cross_fields option for Elasticsearch searches, supported in Elasticsearch 6.X and above."
89	- "See documentation at https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-multi-match-query.html#type-cross-fields"	89	- "See documentation at https://www.elastic.co/guide/en/elasticsearch/reference/current/query-dsl-multi-match-query.html#type-cross-fields"
90	Search form:	90	-
		91	- 'Ignore the following words when sorting the serial search result table (separate words with spaces) :'
		92	- pref: SortIgnoreArticles
		93	class: free
		94	Search Form:
91	-	95	-
92	- pref : LoadSearchHistoryToTheFirstLoggedUser	96	- pref : LoadSearchHistoryToTheFirstLoggedUser
93	default: 0	97	default: 0

Lines 21-26 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/datatables.inc (-2 / +3 lines)
21	var MSG_DT_COPIED_ONE_ROW = _("Copied one row to clipboard");	21	var MSG_DT_COPIED_ONE_ROW = _("Copied one row to clipboard");
22	var MSG_CLEAR_FILTER = _("Clear filter");	22	var MSG_CLEAR_FILTER = _("Clear filter");
23	var MSG_DT_ALL = _("All");	23	var MSG_DT_ALL = _("All");
24	var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = _("a an the");	24	var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = "[% Koha.Preference('SortIgnoreArticles') %]";
		25	//]]>
25	</script>	26	</script>
26	[% Asset.js("js/datatables.js") \| $raw %]	27	[% Asset.js("js/datatables.js") %]

Lines 158-164 else Link Here

(-)a/serials/serials-search.pl (-2 / +1 lines)
158	}	158	}
159		159
160	#sort stopword by string length	160	#sort stopword by string length
161	my @sortedstopword = sort{ length $b <=> length $a } split ( / / ,C4::Context->preference("SerialSortIgnoreWords"));	161	my @sortedstopword = sort{ length $b <=> length $a } split ( / / ,C4::Context->preference("SortIgnoreArticles"));
162	my $subsctitle;	162	my $subsctitle;
163	my (@openedsubscriptions, @closedsubscriptions);	163	my (@openedsubscriptions, @closedsubscriptions);
164	for my $sub ( @subscriptions ) {	164	for my $sub ( @subscriptions ) {
165	-

Return to bug 19368

Lines 600-606 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here

(-)a/installer/data/mysql/mandatory/sysprefs.sql (-1 / +1 lines)
600	('SendAllEmailsTo','',NULL,'All emails will be redirected to this email if it is not empty','free'),	600	('SendAllEmailsTo','',NULL,'All emails will be redirected to this email if it is not empty','free'),
601	('SeparateHoldings','0',NULL,'Separate current branch holdings from other holdings','YesNo'),	601	('SeparateHoldings','0',NULL,'Separate current branch holdings from other holdings','YesNo'),
602	('SeparateHoldingsBranch','homebranch','homebranch\|holdingbranch','Branch used to separate holdings','Choice'),	602	('SeparateHoldingsBranch','homebranch','homebranch\|holdingbranch','Branch used to separate holdings','Choice'),
603	('SerialSortIgnoreWords','',NULL,'Words to ignore in serial search','Free'),
604	('SessionRestrictionByIP','1','Check for change in remote IP address for session security. Disable only when remote IP address changes frequently.','','YesNo'),	603	('SessionRestrictionByIP','1','Check for change in remote IP address for session security. Disable only when remote IP address changes frequently.','','YesNo'),
605	('SessionStorage','mysql','mysql\|Pg\|tmp','Use database or a temporary file for storing session data','Choice'),	604	('SessionStorage','mysql','mysql\|Pg\|tmp','Use database or a temporary file for storing session data','Choice'),
606	('ShelfBrowserUsesCcode','1','0','Use the item collection code when finding items for the shelf browser.','YesNo'),	605	('ShelfBrowserUsesCcode','1','0','Use the item collection code when finding items for the shelf browser.','YesNo'),
Lines 617-622 INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` Link Here
617	('SMSSendPassword', '', '', 'Password used to send SMS messages', 'free'),	616	('SMSSendPassword', '', '', 'Password used to send SMS messages', 'free'),
618	('SMSSendUsername', '', '', 'Username/Login used to send SMS messages', 'free'),	617	('SMSSendUsername', '', '', 'Username/Login used to send SMS messages', 'free'),
619	('SocialNetworks','0','','Enable/Disable social networks links in opac detail pages','YesNo'),	618	('SocialNetworks','0','','Enable/Disable social networks links in opac detail pages','YesNo'),
		619	('SortIgnoreArticles','',NULL,'Words to ignore in serial search','Free'),
620	('SpecifyDueDate','1','','Define whether to display \"Specify Due Date\" form in Circulation','YesNo'),	620	('SpecifyDueDate','1','','Define whether to display \"Specify Due Date\" form in Circulation','YesNo'),
621	('SpecifyReturnDate',1,'','Define whether to display \"Specify Return Date\" form in Circulation','YesNo'),	621	('SpecifyReturnDate',1,'','Define whether to display \"Specify Return Date\" form in Circulation','YesNo'),
622	('SpineLabelAutoPrint','0','','If this setting is turned on, a print dialog will automatically pop up for the quick spine label printer.','YesNo'),	622	('SpineLabelAutoPrint','0','','If this setting is turned on, a print dialog will automatically pop up for the quick spine label printer.','YesNo'),

Lines 1-5 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/datatables.inc (-1 / +30 lines)
1	[% USE raw %]	1	[% USE Koha %]
2	[% USE Asset %]	2	[% USE Asset %]
3	[% INCLUDE 'format_price.inc' %]	3	[% INCLUDE 'format_price.inc' %]
4	[% Asset.js("lib/datatables/datatables.min.js") \| $raw %]	4	[% Asset.js("lib/datatables/datatables.min.js") \| $raw %]
		5	[% Asset.js("lib/jquery/plugins/jquery.dataTables.min.js") \| $raw %]
		6	[% Asset.js("lib/jquery/plugins/dataTables.buttons.min.js") \| $raw %]
		7	[% Asset.js("lib/jquery/plugins/buttons.colVis.min.js") \| $raw %]
		8	[% Asset.js("lib/jquery/plugins/jszip.min.js") \| $raw %]
		9	[% Asset.js("lib/jquery/plugins/buttons.print.min.js") \| $raw %]
		10	[% Asset.js("lib/jquery/plugins/buttons.html5.min.js") \| $raw %]
		11	<script type="text/javascript">
		12	//<![CDATA[
		13	var MSG_DT_FIRST = _("First");
		14	var MSG_DT_LAST = _("Last");
		15	var MSG_DT_NEXT = _("Next");
		16	var MSG_DT_PREVIOUS = _("Previous");
		17	var MSG_DT_EMPTY_TABLE = _("No data available in table");
		18	var MSG_DT_INFO = _("Showing _START_ to _END_ of _TOTAL_");
		19	var MSG_DT_INFO_EMPTY = _("No entries to show");
		20	var MSG_DT_INFO_FILTERED = _("(filtered from _MAX_ total entries)");
		21	var MSG_DT_LENGTH_MENU = _("Show _MENU_ entries");
		22	var MSG_DT_LOADING_RECORDS = _("Loading...");
		23	var MSG_DT_PROCESSING = _("Processing...");
		24	var MSG_DT_SEARCH = _("Search:");
		25	var MSG_DT_ZERO_RECORDS = _("No matching records found");
		26	var MSG_DT_ALL = _("All");
		27	var CONFIG_EXCLUDE_ARTICLES_FROM_SORT = "[% Koha.Preference('SortIgnoreArticles') %]";
		28	var MSG_DT_COPY_TITLE = _("Copy to clipboard");
		29	var MSG_DT_COPY_KEYS = _("Press ctrl or ⌘ + C to copy the table data<br>to your system clipboard.<br><br>To cancel, click this message or press escape.");
		30	var MSG_DT_COPY_SUCCESS_ONE = _("Copied one row to clipboard");
		31	var MSG_DT_COPY_SUCCESS_X = _("Copied %d rows to clipboard");
		32	//]]>
		33	</script>
5	[% Asset.js("js/datatables.js") \| $raw %]	34	[% Asset.js("js/datatables.js") \| $raw %]