Koha/koha-tmpl/intranet-tmpl/prog/en/includes
Kyle M Hall 908096bf1c Bug 12295: fix Javascript error when merging authorities
Attempting to merge authorities results in the following error:
Uncaught SyntaxError: Unexpected token u authorities-home.pl:284
    showMergingInProgress authorities-home.pl:284
    (anonymous function) authorities-home.pl:297
    o jquery.js:2
    p.fireWith jquery.js:2
    e.extend.ready jquery.js:2
    c.addEventListener.B

This was the result of the upgrade of jquery-cookie by the patch
for bug 11369; newer versions of jquery-cookie changed the return of
$.cookie('foo') from null to undefined when the cookie is not present.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
No test plan, no errors.

Test
1. search some authorities
2. click merge, on browser dev console pops reported error message
'Unexpected token u authorities-home.pl...'
No way to marge auths
3. with pach applied, merging works again

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
2014-06-05 12:16:39 -03:00
..
csv_headers/acqui Bug 12110: Display the order vendor note in basket and basketgroup CSV and PDF 2014-05-25 15:21:22 +00:00
virtualshelves/merge
acquisitions-add-to-basket.inc Bug 11665: An ability to place orders directly from hold ratios list 2014-05-04 19:13:39 +00:00
acquisitions-menu.inc
acquisitions-search.inc Bug 10115 - Hiding advanced search in Orders search tab removes plus button 2013-04-26 07:53:49 -04:00
acquisitions-toolbar.inc Bug 9674 - Replace YUI buttons and menu on acquisitions pages with Bootstrap 2013-03-02 12:22:07 -05:00
additem.js.inc Bug 10576: make strings in additem.js accessible to translation 2013-07-22 15:40:21 +00:00
admin-menu.inc Bug 7372: Move road types from the roadtype table to the ROADTYPE AV 2014-02-21 16:00:53 +00:00
auth-finder-search.inc Bug 10808: make authority search form retain drop-down selections 2013-12-10 04:25:12 +00:00
authorities-search-results.inc Bug 7442: (follow-up) restore display of heading type for non-UNIMARC 2014-05-05 01:27:33 +00:00
authorities-search.inc Bug 7484: keep selected values when changing search type on authority search form 2013-11-27 18:30:35 +00:00
authorities-toolbar.inc Bug 10096: (follow-up) rename button on authorities toolbar 2013-10-04 15:06:15 +00:00
authorities.inc Bug 8523: Display auth hierarchies w/all marcflavours 2012-09-21 14:52:08 +02:00
authorities_js.inc Bug 12295: fix Javascript error when merging authorities 2014-06-05 12:16:39 -03:00
av-build-dropbox.inc Bug 766: (follow-up) improve usage comments in new TT include 2014-05-04 23:11:34 +00:00
biblio-default-view.inc
biblio-view-menu.inc
borrower_debarments.inc Bug 11182: remove spurious logged warnings in circulation 2014-04-29 17:49:48 +00:00
browser-strings.inc Bug 10404: add previous/next browsing to staff client 2013-08-09 15:07:39 +00:00
budgets-active-currency.inc
budgets-admin-search.inc
budgets-admin-toolbar.inc Bug 9628 - Replace YUI buttons and menus on budgets administration pages with Bootstrap 2013-02-18 08:24:37 -05:00
calendar.inc Bug 10694: (follow-up) fix various issues 2014-05-02 21:44:46 +00:00
cat-menu.inc
cat-search.inc Bug 12094: fix default tab selection broken by jQueryUI upgrade 2014-04-22 14:51:18 +00:00
cat-toolbar.inc Bug 12138 - Use placeholders in translatable Javascript strings 2014-04-27 21:24:04 +00:00
cataloging-search.inc
checkin-search.inc Bug 9608 - White background on header on check in 2013-02-15 07:49:13 -05:00
checkouts-table-footer.inc Bug 8972 - Due Date set to 100 years ago 2012-11-08 23:23:25 -05:00
circ-menu.inc Bug 11087: Make the Pay Fines tab the default tab 2014-02-20 19:31:13 +00:00
circ-menu.tt Bug 11087: Make the Pay Fines tab the default tab 2014-02-20 19:31:13 +00:00
circ-search.inc
cities-admin-search.inc
contracts-admin-search.inc Bug 9608 - White background on header on check in 2013-02-15 07:49:13 -05:00
currencies-admin-search.inc Bug 9608 - White background on header on check in 2013-02-15 07:49:13 -05:00
datatables-strings.inc Bug 11555: Make "All" one of the default options for datatables 2014-03-10 18:49:33 +00:00
datatables.inc Bug 11555: Make "All" one of the default options for datatables 2014-03-10 18:49:33 +00:00
date-format.inc Bug 9508: Standardize the dateformat value from C4::Auth 2013-05-20 09:05:01 -07:00
doc-head-close-receipt.inc Bug 10592: fix display of favicon 2013-07-22 14:00:23 +00:00
doc-head-close.inc Bug 11753 - Replace jQuery qTip plugin with Bootstrap tooltip on patron search form 2014-02-18 21:08:43 +00:00
doc-head-open.inc Bug 9265 - Switch to HTML5 doctype in OPAC and staff client 2013-01-31 11:47:04 -05:00
facets.inc Bug 10857: (follow-up) encode 'limit' parameter values 2014-05-05 21:43:33 +00:00
file-upload.inc Bug 12103 - Move ajaxfileupload jQuery plugin outside of language-specific directory 2014-04-25 15:09:16 +00:00
form-blocks.inc
greybox.inc Bug 12101 - Move Greybox library outside of language-specific directory 2014-04-25 15:14:03 +00:00
guided-reports-view.inc
header.inc Bug 10862: Add search history to the intranet interface 2014-05-05 03:06:33 +00:00
help-bottom.inc
help-top.inc Bug 11035: (follow-up) move shortcut.js 2013-12-03 15:35:15 +00:00
home-search.inc
installer-doc-head-close.inc Bug 2774 - Path to theme is hard-coded in many places 2013-06-07 09:04:15 -07:00
intranet-bottom.inc Bug 5052: make it possible to pick a language if all choices are sublanguage 2014-04-15 14:36:29 +00:00
intranetstylesheet.inc Bug 10052 Followup for edithelp.tt and help-top.inc 2013-05-23 08:55:11 -07:00
labels-menu.inc
labels-toolbar.inc Bug 9636 - Replace YUI buttons on labels pages with Bootstrap 2013-02-18 08:57:34 -05:00
letters-search.inc Bug 9608 - White background on header on check in 2013-02-15 07:49:13 -05:00
members-menu.inc
members-toolbar.inc Bug 2310: display tooltips explaining why patron menu items are disabled 2013-12-05 16:36:43 +00:00
merge-record-strings.inc Bug 10650 - export merge-record.inc javascript into a file 2013-09-16 16:17:34 +00:00
merge-record.inc Bug 10650 - export merge-record.inc javascript into a file 2013-09-16 16:17:34 +00:00
messaging-preference-form.inc Bug 10511: (follow-up) jQuery .removeAttr() has only one parameter 2013-08-12 14:12:38 +00:00
page-numbers.inc Bug 9134: There is no previous link on the second page of the search results page 2012-12-02 09:16:58 -05:00
patron-search-box.inc Bug 11570 - Upgrade jQueryUI to latest version in the staff client 2014-04-07 15:37:27 +00:00
patron-search.inc Bug 11753 - Replace jQuery qTip plugin with Bootstrap tooltip on patron search form 2014-02-18 21:08:43 +00:00
patron-title.inc Bug 2930 [REVISED] Put other name on checkout screen 2012-10-09 12:23:39 +02:00
patron-toolbar.inc Bug 9772 - Display Norwegian chars correctly in the patron category dropdown 2013-03-20 08:02:52 -04:00
patroncards-errors.inc Bug 9924: (follow-up) ensure that correct error message is displayed 2013-09-08 19:19:50 +00:00
patroncards-menu.inc
patroncards-toolbar.inc Bug 9698 - Replace YUI buttons on patron card creator manage toolbar with Bootstrap 2013-03-07 09:52:20 -05:00
patrons-admin-search.inc
popup-bottom.inc
prefs-admin-search.inc Bug 8702: System preferences search does not allow accented letters 2012-09-26 19:02:18 +02:00
prefs-menu.inc Bug 12190: fold the "Creators" system preference tab into "Tools" 2014-05-23 13:09:51 +00:00
printers-admin-search.inc Bug 9608 - White background on header on check in 2013-02-15 07:49:13 -05:00
quotes-toolbar.inc Bug 9645 - Replace YUI buttons on the quotes management page with Bootstrap 2013-02-18 09:09:57 -05:00
quotes-upload-toolbar.inc Bug 9645 - Replace YUI buttons on the quotes management page with Bootstrap 2013-02-18 09:09:57 -05:00
reports-menu.inc
reports-toolbar.inc Bug 12214: (follow-up) Clean up reports-toolbar.inc, show Edit link when SQL has errors 2014-05-09 14:40:15 +00:00
resort_form.inc
search_indexes.inc Bug 10755 - Add "Keyword as Phrase" to staff client advanced search indexes 2013-09-04 14:25:47 +00:00
serials-menu.inc Bug 7688: Change subscription numbering pattern and frequencies 2013-10-30 00:29:38 +00:00
serials-search.inc
serials-toolbar.inc Bug 9627 - Replace YUI buttons and menus on serials pages with Bootstrap 2013-02-18 08:22:59 -05:00
slip-print.inc Bug 11014 - Slip Print Problem in Chrome 2014-05-30 16:05:23 -03:00
stopwords-admin-search.inc Bug 9608 - White background on header on check in 2013-02-15 07:49:13 -05:00
subscriptions-search.inc Bug 5343: Link serial and acqui modules 2013-03-22 23:54:43 -04:00
subtypes_unimarc.inc Bug 11503: fix several typos 2014-01-13 20:47:03 +00:00
suggestions-add-search.inc Bug 9608 - White background on header on check in 2013-02-15 07:49:13 -05:00
timepicker.inc Bug 11618: ensure jQuery timepicker is picked up by the i18n toolchain 2014-02-18 21:19:16 +00:00
tools-item-action.inc Bug 7131: teach MARC import how to overlay items 2013-10-30 04:31:07 +00:00
tools-menu.inc Bug 8015: (follow-up) fix various issues (squashed patch) 2013-10-31 22:49:45 +00:00
tools-nomatch-action.inc
tools-overlay-action.inc
validator-strings.inc Bug 6209 follow-up, make strings translatable 2013-03-23 00:12:59 -04:00
vendor-menu.inc Bug 8913 [Revised] Improve acquisitions navigation 2013-02-20 09:17:21 -05:00
virtualshelves-toolbar.inc Bug 10714: Redirect to list contents view upon save after initiating edit from list contents view (staff) 2014-02-20 16:53:32 +00:00
z3950-admin-search.inc Bug 10307 - z39.50 server search tab shows z390.50 2013-06-04 11:41:10 -07:00