Katrin Fischer [Sun, 14 Apr 2013 17:29:13 +0000 (19:29 +0200)]
Bug 8294: Fix display of serial enumeration for OPAC holds
It turns out that this was not a missing but a broken feature.
This patch corrects the template variables to make enumchron
show up on the item table for item level holds in the OPAC.
To test:
Try to place item level holds on
1) a record where at least one item
2) a record where none of the items
has items.enumchron information.
The column with enumchron should only show for 1), but not
for 2).
Signed-off-by: David Cook <dcook@prosentient.com.au>
Works as described.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
815bcbc1d16ad2764fde9f6d3221d2527e48855a)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Sat, 20 Apr 2013 02:52:07 +0000 (22:52 -0400)]
Bug 10085: unapi does not function under Plack
The following errors appear when trying to use unapi under Plack (among
others):
Variable "$cgi" is not available at /home/jcamins/kohaclone/opac/unapi line 160.
Variable "$format_to_stylesheet_map" is not available at /home/jcamins/kohaclone/opac/unapi line 173.
Variable "$format_info" is not available at /home/jcamins/kohaclone/opac/unapi line 174.
Variable "$format_to_stylesheet_map" is not available at /home/jcamins/kohaclone/opac/unapi line 185.
To test:
1) Try to view /cgi-bin/koha/unapi under Plack
2) There is no step 2. Plack crashes.
3) Apply patch.
4) Try to view /cgi-bin/koha/unapi again, and note that it doesn't crash
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
I'm puzzled how this ever worked anyway, accidentally i'm guessing,
this tidies up some lazy coding
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
c02931977e5121b51eb29db6116b768c24a1aadd)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Kyle M Hall [Thu, 7 Feb 2013 14:57:47 +0000 (09:57 -0500)]
Bug 9523: importing staged bib records hangs if a matched bib has been deleted
Test Plan:
1) Stage a MARC record file that will have matches with existing records
2) Delete the bib from Koha that was matched on
3) Attempt to import the records into Koha, the import will hang
4) Apply the patch
5) Reload manage-marc-import.pl and attempt to import again, this time it should succeed.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
ea23dbeab2a2f5cf6be64e707ea56b3ea89e437b)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Fridolyn SOMERS [Mon, 11 Feb 2013 13:47:09 +0000 (14:47 +0100)]
Bug 9588: weighted search query with index
When QueryWeightFields is enabled, the searching query is created with several options.
In C4::Search::_build_weighted_query, when no index is defined, the query is build with fuzzy and stemming options. When an index is defined, theses options are missing, only unconditional right truncation is used.
The consequence is that when QueryStemming is disabled, a search with index can give more results (due to right truncation) that a search without.
This patch adds stemming and fuzzy on search with index, conditioned with QueryFuzzy and QuerryStemming sysprefs.
Also changes world list search (wrld) weight to r6 in order to set fuzzy search to r8 and stemming search to r9 (like search without index).
Test plan :
- Go to searching preferences (admin/preferences.pl?tab=searching)
- Set QueryAutoTruncate to "only if * is added"
- Set QueryFuzzy and QuerryStemming to "Don't try"
- Set QueryWeightFields to "Enable"
- Go to advanced search page
- Select an indexe (ie Title) and perform a search on a short word
=> Look at zebrarv log and see that query does not contain right truncation : @attr 5=1
- Set QueryFuzzy to "Try"
- Perform same search
=> Look at zebrarv log and see that query contains fuzzy : @attr 5=103
- Set QueryFuzzy to "Don't try" and QuerryStemming to "Try"
- Perform same search
=> Look at zebrarv log and see that query contains rigth truncation on stemmed word : @attr 5=1
Signed-off-by: koha.aixmarseille <koha.aixmarseille@gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
This patch makes Fuzzy and Stemming influence search results on weighted
queries when using an index. Side-effect is however that the results for a
search like index=term* (add truncation manually too) could be LOWER than the
the number of hits for index=term. Further comments on Bugzilla.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
39bf1c502aec95742c81f43d7d631223b399ce5b)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jonathan Druart [Wed, 3 Apr 2013 13:31:08 +0000 (15:31 +0200)]
Bug 9984: Remove server-side sort on the hold ratios table
JS is a requirement for the staff client, so the sort link on header is
useless.
Test plan:
Check that there is no regression (sort, data, etc.) on the hold ratios
table.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested on top of patch for bug 9459.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
91155470ba3cbee869368d6904cb3da4a0197768)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Owen Leonard [Mon, 15 Apr 2013 13:23:58 +0000 (09:23 -0400)]
Bug 10049 [Alternate] Comments tab shows ( ) instead of ( 0 ) on translated templates
This patch is an alternate solution to the problem of "0" not appearing
on the comment tab in translated templates. It uses the Template Toolkit
option of specifying a default value for a variable:
[% reviews.size || 0 %]
This syntax is already in use elsewhere in the template.
Same test plan:
1) Make sure comments/reviews are activated
2) Find a record with 0 comments/reviews in the opac
3) The tab shows: Comments ( 0 )
4) Switch to any other languages.
5) Tab now shows: <translation of Comments> ( )
6) Apply patch
7) Check English templates stil work correctly
8) Rerun 'perl translate install <langcode>
9) Check display is now correct.
10) Also check that number shows correctly for records
with comments.
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Tested with nb-NO. English still works after the patch. Norwegian
was showing "Comments" untranslated, which had me a bit unnerved.
Turns out the string to be translated changed from "Comments ( %s%s%s%s )"
to "Comments ( %s )", so to make sure all was well, I had to update
the nb-NO translation, fix the number of %s's in the Norwegian string,
make sure it was not marked as fuzzy and then install nb-NO. And it
works!
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
6910bec11677bbee4e29a4c79587cbcf60c28e85)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Kyle M Hall [Wed, 27 Mar 2013 17:57:01 +0000 (13:57 -0400)]
Bug 9839 - when importing MARC records, item record not created even when set to "always add"
Test Plan:
1) Catalog a new record with an ISBN
2) Add some items to the record
3) Download the record as MARCXML
4) Delete the itemnumbers from the 952 fields in the record,
Change the barcode fields to unused barcodes
5) Use xml2marc to save as a standard MARC file
6) Import the record using the 'Stage MARC for import' tool
Use the settings:
Record matching rule: ISBN
Action if matching record found: ignore
Action if no match found: ignore
Item processing: always_add
Check for embedded item record data?: Yes
How to process items: Always add items
7) Import, note the bib is ignored, and the items are not processed
8) Undo import into catalog
8) Apply this patch
9) Import this batch into the catalog
10) Note the items were processed and are now added to the matching
record
Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Tested with UNIMARC record. I followed the test plan, just changing 952 by 995
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
a986c92c4d92da6fb1bba330cf693dde31207877)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Kyle M Hall [Mon, 8 Apr 2013 13:07:43 +0000 (09:07 -0400)]
Bug 9995 - For reference items no longer listed in XSLT result lists
Re-added the xsl that shouldn't have been removed.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested with different settings for OpacItemLocation
and not for loan set in the item and for the item type.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
cbe3e7656d9050dbebb6224f7f7c5fb419a2e6c3)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Owen Leonard [Tue, 16 Apr 2013 13:37:24 +0000 (09:37 -0400)]
Bug 10065 - Style invoice edit form according to standard structure
The structure of the invoice edit form does not match that of similar
forms in the staff client. This patch alters it to be consistent.
To test you must also have the patch for Bug 10046 applied.
Go to Acquisitions -> Invoices and search for invoices. Click an invoice
to view/edit details. The form displaying fields for shipment date,
billing date, etc. should look correct and work correctly.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
6e88f5c736689cab23561e3f8be968e973f52c61)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Sun, 21 Apr 2013 13:43:16 +0000 (09:43 -0400)]
Add Barry Cannon to the history file
Welcome, Barry, you are the 208th developer with a patch in Koha!
(cherry picked from commit
d2c989713999cab4a7b4bf7ea69e2d7d036e876c)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Mason James [Tue, 2 Apr 2013 09:36:16 +0000 (22:36 +1300)]
Bug 8745: General whitespace and tab tidy
http://bugs.koha-community.org/show_bug.cgi?id=8745
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
1) Runs not with root.
2) Runs with root and -run-as-root.
3) Runs using the normal koha user.
Note: Maybe the message should be clear about why
running as root is bad and which user you should
be running the script with?
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
2eefd1f3a588532950bed42ff20fcb6ff3f932a3)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Barry Cannon [Mon, 10 Sep 2012 14:23:29 +0000 (15:23 +0100)]
Bug 8745 - Disallow rebuild_zebra.pl from executing, when run by root user.
Added a check to warn users of execution as root user.
Added a 'runas-root' switch to allow users to force execution as root user.
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
ef86a77801ea42eb1f703a77f53123ccb924a9fe)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Fridolyn SOMERS [Thu, 14 Feb 2013 13:23:30 +0000 (14:23 +0100)]
Bug 9613: items namespace missing in XSLT
In some XSLT, "items" namespace is used in exclude-result-prefixes but is not defined.
This patch add this namespace where missing.
Also corrects a koha.org, instead of koha-community.org, in one namespace URL.
Test plan :
- Enable XSLT on search results
- Perform a search
=> Look at error logs to check that there is no xsl error like :
[Fri Feb 08 15:35:06 2013] [error] [client 127.0.0.1] [Fri Feb 8 15:35:06 2013] opac-search.pl: compilation error: file koha-tmpl/opac-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl line 8 element stylesheet, referer: http://opac.master.community.localhost/cgi-bin/koha/opac-detail.pl?biblionumber=299
[Fri Feb 08 15:35:06 2013] [error] [client 127.0.0.1] [Fri Feb 8 15:35:06 2013] opac-search.pl: xsl:exclude-result-prefixes : undefined namespace items, referer: http://opac.master.community.localhost/cgi-bin/koha/opac-detail.pl?biblionumber=299
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
With comment on Bugzilla.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
00b587e5ccc3de4d457eef45008ce9741146ab13)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Katrin Fischer [Sun, 14 Apr 2013 15:29:20 +0000 (17:29 +0200)]
Bug 10046: Standardize terms used in invoices
Changes are:
budget > where actually fund is meant
branch > library
bookseller, supplier > vendor
To test:
1) Receive a shipment, check the little form where you
enter your invoice number for correct use of terms.
2) Receive some orders and save finish receiving.
3) Search for your created invoice. Check filters and
results table for correct use of terms.
4) Look at the details of your invoice, repeat check there.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
9a67617eaffc8427441c1270e9b0acd0a7d2f33d)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Owen Leonard [Mon, 8 Apr 2013 14:13:11 +0000 (10:13 -0400)]
Bug 9860 [Alternate] Incorrect box heading 'Cannot check in' when a late document is returned
The fix for Bug 9397 moved the "cannot check in" heading from within the
one conditional where it should have been displayed to the top of all
check-in errors/messages. "Cannot check in" is still only valid if the
item is withdrawn and BlockReturnOfWithdrawnItems is ON.
In order to accomplish the goal of Bug 9397 while fixing Bug 9860 this
patch puts "cannot check in" back into the correct conditional and adds
a generic heading to check in messages for accessibility purposes.
To test, check in items which will trigger a variety of errors
including:
- item must be returned to home library
- item is lost
- item is withdrawn (wtih BlockReturnOfWithdrawnItems on and off)
- item is overdue
...as well as items which should check in normally. Messages should
display correctly.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
3ce75bcf2631bccb584dff6ea2f78d16f49770f8)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Julian Maurice [Tue, 19 Mar 2013 13:54:32 +0000 (13:54 +0000)]
Bug 8746 [Follow-up] Replace == by eq in string comparison
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
357cf7fdd850008e4c4f94a4d8d115490a3f4262)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Julian Maurice [Fri, 11 Jan 2013 10:57:41 +0000 (11:57 +0100)]
Bug 8746: Fix indexation in DOM index mode
When in DOM index mode, files exported by `rebuild_zebra.pl -x` are
wrapped by '<collection></collection>' tag.
This is a problem because splitting files produces invalid files.
This is fixed by adding the missing <collection> tags in each generated
file.
Another problem was that the wrong zebra configuration file was used.
The script now uses C4::Context->zebraconfig($server)->{config} to know
which configuration file has to be used.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
a4e844369106f0713123c8a2ecec12b0ed7b0027)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Julian Maurice [Thu, 20 Sep 2012 10:12:31 +0000 (12:12 +0200)]
Bug 8746: rebuild_zebra_sliced.sh now export/index records as MARCXML
This avoid indexing failures due to "bad offset" or "bad length" error
with ISO2709 format
+ minor improvements:
- --length parameter is optional. If not given, it will execute the
right sql query to find the number of records to index
- new parameter --reset-index. If set, index is reset before indexing
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described. No errors.
Test: Edit record to make it longer than 9999. Without patch rebuild_sliced
fails. With patches works.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
eef4b3f23c0b4558bd2a87af009f39012393994c)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Marcel de Rooy [Tue, 2 Apr 2013 13:17:31 +0000 (15:17 +0200)]
Bug 9951: Followup for tools/viewlog.pl
Adds utf8 cgi parameter decoding.
Test plan: Enter diacritics in librarian field. Submit. Check.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
This is ok in this case, as we are not doing any post/get of binary
data, but I note from the man page
This makes CGI.pm treat all parameters as UTF-8 strings. Use this with
care, as it will interfere
with the processing of binary uploads. It is better to
manually select which fields are expected
to return utf-8 strings and convert them using code like
this:
use Encode;
my $arg = decode utf8=>param('foo');
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
de7ba790fd2533bcf44ad7fd2f1255514ed9313c)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Marcel de Rooy [Tue, 2 Apr 2013 12:06:02 +0000 (14:06 +0200)]
Bug 9951: Followup for Tools
Adds decoding for Patron Cards/Patron Search and Tags (moderation).
Test plan:
Goto Tools. Add accent with diacritics in both areas. Check if you do not see
converted characters.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
252568aa8babdcc9508d3b3c7626543bfa648d99)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Kyle M Hall [Wed, 17 Apr 2013 18:07:55 +0000 (14:07 -0400)]
Bug 10072 - "my suggestions" always says "There are no pending purchase suggestions."
Test Plan:
1) Switch off the IndependantBranches syspref
2) Log into the OPAC
3) Place a suggestions
4) Instead of seeing your suggestion, you will see "There are no pending
purchase suggestions."
5) Apply this patch
6) Reload the page
7) You should now see your suggestions
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
fd9534628b0234375688e031fc65d4aee3bbd091)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Marcel de Rooy [Wed, 10 Apr 2013 08:13:52 +0000 (10:13 +0200)]
Bug 10019: Fix for userid containing UTF8 chars
Decodes userid on two places in checkauth of C4/Auth.pm
Test plan:
Include some non-Latin characters in your userid (loginname). Arab, Chinese?
Login into opac and check user page.
Go to staff (no new login), check your login name at various places.
Logout, login via staff.
Do the same.
Go to opac again (no new login), check user page.
Optionally: Remove all your sessions from table. Do a login. Check sessions.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Works as described. No errors.
This patch fixes this problem, but I wonder if
there is a general solution that handle all as utf8.
Tested in opac and staff.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
7e90e1524f7e586dac0f98241ace430e5cbeac7f)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Marcel de Rooy [Fri, 19 Apr 2013 12:44:35 +0000 (14:44 +0200)]
Bug 10074: QA Followup for InstallAuth.pm
Moving use Output.pm to optional require.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
e848d89e45d3e6610c3e9d246bd3672636dd63fb)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Tomas Cohen Arazi [Thu, 18 Apr 2013 19:27:03 +0000 (16:27 -0300)]
Bug 10074 - Encoding problems for installer
Bug 6554 patched output_html_with_http_headers to encode utf8 data, and Templates.pm to expect utf8 data to be encoded.
The Installer page login screen outputs directly to STDOUT (InstallAuthAuth.pm does, WHICH IS WRONG!) and wasn't fixed to do the encoding first.
This patch makes it use output_html_with_http_headers and solves the problem.
Regards
To+
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
d0c6e09429d2af711f911b57601a02f17591d441)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Tomas Cohen Arazi [Thu, 18 Apr 2013 18:07:40 +0000 (15:07 -0300)]
Bug 10074 - Encoding problems at login time
Bug 6554 patched output_html_with_http_headers to encode utf8 data, and Templates.pm to expect utf8 data to be encoded.
(At least) the staff login screen outputs directly to STDOUT (Auth.pm does, WHICH IS WRONG!) and wasn't fixed to do the encoding first.
This patch makes it use output_html_with_http_headers and solves the problem.
Changed 'use' for 'require' as jcamins and marcelr suggested.
Regards
To+
Sponsored-by: Universidad Nacional de Cordoba
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
5805b5f363bd657d3dac6aeba225438bf80cae9b)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Magnus Enger [Mon, 15 Apr 2013 19:56:53 +0000 (21:56 +0200)]
Bug 10058 - Fix unapi for NORMARC
This patch uses a lot of MARC21 XSLT to transform NORMARC records
to desired formats. Since NORMARC is mostly a subset of MARC21, I
think this should give passable results. And better results than
no unapi-support at all for NORMARC!
To reproduce:
- Make sure you have marcflavour = NORMARC
- Visit /cgi-bin/koha/unapi in a browser
- Observe the empty <formats></formats> element
To test:
- Apply the patch
- Visit /cgi-bin/koha/unapi in a browser
- Observe the the list of formats in the <formats></formats> element
- Import the provided sample NORMARC record and make a note of its
biblionumber
- View the record at /cgi-bin/koha/unapi?id=koha:biblionumber:x&format=y
where x = the biblionumber of the sample record and y = one of the
formats marcxml, marcxml-full, mods, mods-full, mods3, mods3-full,
oai_dc, rdfdc, rss2, rss2-full and srw_dc
- Check that the transformed records make some kind of superficial
sense
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
c5e2c06a791f97f39cc2e93fa0092de6eaa9cb07)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Marcel de Rooy [Mon, 15 Apr 2013 13:05:54 +0000 (15:05 +0200)]
7368 Typo in edithelp.pl warning
Typo: able save => able to save.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
0f92532b52da70bea81babc1c02fdc8fc045024c)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Marcel de Rooy [Thu, 4 Apr 2013 07:58:17 +0000 (09:58 +0200)]
Bug 7368: Typo in kohastructure.sql documentation line
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
c134a3c5c325a2637793b43c8649742ad8826828)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Colin Campbell [Thu, 4 Apr 2013 09:54:03 +0000 (10:54 +0100)]
Bug 6554 Fix error caused by modifying $_ in a map
Error 'Modification of a read-only value attempted' triggered
on login because of manipulation of $_ in the map
Moved the mod to a loop as recommended in the doc for map
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
e98fe7e32244fa11d218b4d2a1006eea547e70d8)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Owen Leonard [Mon, 8 Apr 2013 14:26:06 +0000 (10:26 -0400)]
Bug 10000 - Little typo in intranet-tmpl/prog/en/modules/help/tools/letter.tt: sliip
This patch removes the extra i in "sliip."
To test, go to Tools -> Notices & Slips and view the help file. The last
bulleted item on the page should contain no typo.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Can't resist to sign Bug 10000!!
Work as described. No errors.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Can't resist to QA - All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
6522e9fe4b8cb90caaf2f5c357f365ac763c8f2f)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Owen Leonard [Tue, 9 Apr 2013 19:44:45 +0000 (15:44 -0400)]
Bug 10002 - Don't include line breaks in strings that are translated
Several JS alert messages contain "\n" which is problematic for
translation. This patch removes those instances (a line break is not
strictly necessary anyway). Also corrected: two instances of "holds(s)"
To test, place a hold on a title with items. From the biblio detail page
choose Edit -> Delete all items and Edit -> Delete record. In each case
you should see error messages with no line breaks and no misspellings.
Delete all items attached to the record with holds from the item edit
page. Go back to the detail page and choose Edit -> Delete record. You
should see an error message about existing hold(s) with no line breaks
or misspellings.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Harmless change, fixes misspellings and makes translations easier
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
24d9d9c1712526cb0fe0a000fe255bfd8dbf1d22)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Owen Leonard [Tue, 9 Apr 2013 19:27:15 +0000 (15:27 -0400)]
Bug 10008 - Serials search results 'Opened' tab should be 'Open'
The searials search results "Opened" tab should be labeled "Open." This
patch makes this correction and changes the wording in another place
which used "opened." Markup has also been added to maintain consistency
in display of messages.
To test, perform a search for a subscription. If your search returns
results you should see an "Open" and a "Closed" tab. To test other
affected changes perform searches which return no results, only open
subscriptions, or only closed subscriptions. "No results" messages
should display correctly and consistently.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
ce1c6ce4d22ee9226f65ec8a1b69874629113df7)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Tomas Cohen Arazi [Sun, 14 Apr 2013 00:31:14 +0000 (21:31 -0300)]
Bug 10042 - Minor typo ("Communnity") in packages docs
VERY trivial string patch. Couldn't help sending it.
To+
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Thanks for fixing my typo! I did not test by building packages
etc, but by grepping for "Communnity". The patch removes
all occurences of the typo.
Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
fd3aed11ec912fc09161db12f18f26c7e0279c51)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Kyle M Hall [Mon, 8 Apr 2013 13:32:08 +0000 (09:32 -0400)]
Bug 9997 - Suspected typo in patron self registration code
String fix. The field name is also incorrect, causing the alternate
contact country to not be stored.
To test: Submit an update to an existing patron record an include a
change to the alternate contact's country field. Before the patch this
line would not appear in the staff client for approval. After the patch
it should.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Reminder: Even small patches require test plans. I have added one which
I think covers the changes in the patch.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
3cd8189fa862164a64215a8c1d8690645c5397f2)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
David Cook [Fri, 1 Mar 2013 02:22:33 +0000 (13:22 +1100)]
Bug 9737 - Local Covers sometimes appear then disappear on OPAC Search Results/Lists
The current problem:
When the verify_images() function runs from amazonimages.js, it loops
through every img element and selects the elements that come from Amazon
sources.
However, if the height/width is 1 (i.e. Amazon passes off a blank image)
or if the img element's complete property is null or non-existent, then
it searches for the parent node and re-writes the HTML with the "No
Cover Image Available" (NO_AMAZON_IMAGE) text, even though that parent
node might contain other img elements that have images available (from
Google, local images, etc)!
Proposed fix:
Wrap the Amazon image in a span tag (as we do with the Google and local
covers), so that it re-writes the HTML within that parent span, rather
than the parent anchor which contains all the other images.
To test:
1) Turn on the OPACAmazonCoverImages, GoogleJackets, and
OPACLocalCoverImages system preferences
2) Replace the ISBN in one of your records with
9780615352435
3) Now load a local cover image for that record
4) Search for that record (but make sure you're vague enough to have
multiple search results)
5) For a split second, you may notice the local cover image appears before being replaced by a "No Cover Image Available".
Now apply this patch
6) Refresh your search results page
7) You should now see your local cover image, PLUS the "No Cover Image
Available" for the Amazon image, and whatever other graphics/"no
cover image available" "graphics" for the Google Jackets.
To be comprehensive, try the same set of steps using the OPAC Lists
rather than the OPAC Search Results
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
2e4747566457d807fef88dff8332c3db18b86b49)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jonathan Druart [Thu, 4 Apr 2013 07:47:25 +0000 (09:47 +0200)]
Bug 9894: Add labels for checkboxes
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
e3a9d492cc5ca142784c3e385867cd5a04b26ce8)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Tomas Cohen Arazi [Wed, 3 Apr 2013 18:50:49 +0000 (15:50 -0300)]
Bug 9894 - (3.12) Small followup
Liz's patch adds the 'flagged' value back, but there's a problem with its logic that prevents it to work on startup (works fine for changing values)
Regards
To+
Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
a0680d0ca2ff9c7b087cd995b85d5614d902e2d9)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Liz Rea [Fri, 29 Mar 2013 09:33:33 +0000 (22:33 +1300)]
Bug 9894 - Followup: Add support for "flagged" values
Even though we don't know what they mean or do.
To test:
- open the docs to have at hand the list of codes/visibility options combinations and
try changing several subfields from a single tagfield. Save, and reopen the "Edit subfields" page.
- Click the "Flagged" checkbox - it should disable the other checkboxes as this setting is (apparently) exclusive to the others.
- Step through several tabs and set your visibilities as you like.
- I had a MySQL shell opened to repeatedly run this query (i tested against field 886
on the default framework):
> SELECT tagfield,tagsubfield,hidden FROM marc_subfield_structure WHERE frameworkcode='' AND tagfield=886;
- Compare what was saved on the DB with the docs for that visibility selection.
Bug 9894 - Help file updates
To test:
Click the Help link in the upper right hand corner of the MARC subfield editor
Verify that the epic list of values is gone
Verify that the help page overall looks alright
Verify that the help makes sense and is understandable.
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
0a91a071efa49b77ca1ff2923aafbd9de1a1a481)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Tomas Cohen Arazi [Tue, 26 Mar 2013 01:55:11 +0000 (22:55 -0300)]
Bug 9894 - (3.12) de-serialize the 'hidden' value for subfields in frameworks
This patch aims to provide a non-intrusive way (with respect to Koha's code, so
it could have got into 3.12) for the users to easily choose the visibility settings
for each subfield.
This patch is also known to have arrived late for 3.12. I've been struggling with
other stuff at work, but I just wanted to put this somewhere just in case it can
be reused or something else.
The patch adds two JavaScript functions that deal with (de)serialization of the 'hidden'
value for subfields. One each way. Listeners are added to the checkboxes so the (actually, heh)
'hidden' value gets correctly updated on each checkbox change.
There's a costly function to update all checkboxes on every tab to match the 'hidden' value on page load.
To test:
- open the docs to have at hand the list of codes/visibility options combinations and
try changing several subfields from a single tagfield. Save, and reopen the "Edit subfields" page.
- I had a MySQL shell opened to repeatedly run this query (i tested against field 886
on the default framework):
> SELECT tagfield,tagsubfield,hidden FROM marc_subfield_structure WHERE frameworkcode='' AND tagfield=886;
- Compare what was saved on the DB with the docs for that visibility selection.
Regards
To+
PS: I promise I'll work on the proper patch for 3.14, which would involve DB structure changes and
(more than I expected) rewriten code.
Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Liz Rea <liz@catalyst.net.nz>
I promise to hug you the next time we meet. This works, and is a reasonable work around for a very longstanding awkward interface.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
557857cf2c881fb7beec2019d3c85cef893c5342)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Robin Sheat [Mon, 15 Apr 2013 23:07:19 +0000 (11:07 +1200)]
Bug 10061 - Fix tinymce path references broken by bug 9172
Only affects the package builds
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
(cherry picked from commit
15f58c257f8830dffb7b7d565f868f4614f2063d)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Owen Leonard [Thu, 29 Nov 2012 19:58:53 +0000 (14:58 -0500)]
Bug 9172 - Move TinyMCE library outside of language-specific directory
This patch removes the TinyMCE library from its language-specific
location and puts it in intranet-tmpl/lib. The most recent version
of TinyMCE is used, and the files added have been limited to
those required for proper functionality of the editor.
Files omitted: documentation, examples, unused plugins.
To test, visit each page which uses the TinyMCE editor: News
editing (tools/koha-news.pl), library editing (admin/branches.pl),
and online help editing (help/edithelp.pl). The editor should
look and function as before.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Mason James <mtj@kohaaloha.com>
(cherry picked from commit
81714f8141de147a9133944057b059df47160315
on github.com/KohaAloha/Koha-Dev:bug_9172)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Corrected authorship and date
(cherry picked from commit
77210d74353cbd2f968df462c2f1b968c3e7decd)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Owen Leonard [Wed, 23 Jan 2013 17:25:39 +0000 (12:25 -0500)]
Bug 9463 [Revised] Use DataTables on patron sent notices page
Replace the tablesorter plugin with the DataTables plugin on the
patron sent notices page.
This patch adds default sorting by time (descending).
This patch depends on the one for Bug 9887, which introduces a new
DataTables plugin to allow sorting on data embedded in a <span>'s
"title" attribute. This allows sorting to be done on an unformatted
datetime.
To test, open the sent notices page for a patron who has multiple sent
notices. Confirm that table sorting works correctly with various date
format settings.
Revision corrects an error which occurs when there are no notices:
Instead of displaying an empty table with a message the table is not
displayed and a standard dialog message is displayed. In order to
prevent page-specific CSS and JS from conflicting with the standard
"message" class the page-specific classes have been changed from
"message*" to "notice*" Test this change by viewing a page with existing
notices and clicking the titles to show/hide the notice contents.
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
9c3137bbf4716a12b9a68febfe201aed8a5b80de)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Owen Leonard [Fri, 22 Mar 2013 17:38:13 +0000 (13:38 -0400)]
Bug 9905 - Use DataTables on calendar page
The calendar management page uses the old tablesorter plugin. This patch
replaces tablesorter code with DataTables.
In order to easily sort date columns under various dateformat system
preference settings, date columns now sort based on an unformatted date
in a <span>'s title attribute (requiring the patch for Bug 9887).
To test, view the calendar page--preferably with plenty of existing
holiday data to populate the holiday summary tables. Confirm that
sorting works correctly on all sorted tables with the dateformat
preference set in all settings.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Note: This has to be tested together with the patch for bug 9887.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
2c2dfd91e7f58fd155362872f156224e8077cb58)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Owen Leonard [Thu, 21 Mar 2013 15:31:43 +0000 (11:31 -0400)]
Bug 9887 [Revised] Use DataTables on circulation page
The circulation page, when the UseTablesortForCirc preference is
enabled, uses the old tablesorter plugin. It should use DataTables
instead.
This patch removes references to the tablesorter plugin and makes these
changes to enable use of DataTables:
- Pass two new unformatted date variables to the template from
circulation.pl so that sorting can be performed on this data.
- Add DataTables configurations for the table of checkouts and the
table of relatives' checkouts.
- Add a new plugin to the main DataTables configuration script to allow
sorting on data embedded in a <span>'s 'title' attribute.
- Add <span>s to each table with a title attribute containing the
unformatted date data which DataTables needs to perform correct
sorting. This eliminates the need for a special sorting algorithm to
accomodate various date and datetime formatting options.
- Set a template variable for checking whether circ exports are enabled.
This reduces repetition. DataTables configuration changes based on how
many columns are present.
To test, load the circulation page for patrons who match various
conditions:
- Having only checkouts from today
- Having checkouts from today and previous days
- Having checkouts only from previous days
- Having relatives who have checkouts (from today, from previous days,
from both)
Test these situations with UseTablesortForCirc enabled and disabled.
Test these situations with circ exports enabled or disabled (with
ExportRemoveFields filled or empty, for instance).
Sorting should work correctly on all columns with the dateformat
preference set to any option.
All other circulation functions should work normally.
Revision adds missing include for table footer when there are previous
checkouts and removes from empty table header cells which were
messing up auto-detection of numeric data. The global CSS for table
borders has been tightened up to improve handling of alternating row
colors in DataTables-sorted tables.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Note: Don't forget it's the checkout tab and to turn on the
preference to allow sorting there.
Also, while checkouts sorts dates correctly, sorting on the
details tabs was not always correct in my tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
ec9fc2fce4fef573cc337ff3de9b102d6dad3ded)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Magnus Enger [Mon, 18 Mar 2013 14:42:03 +0000 (15:42 +0100)]
Bug 9414 - Fix sample letters for German and Norwegian
Some letters were missing or not translated in the German and
Norwegian data for the webinstaller. This patch adds them.
German
- RENEWAL (present, but not translated)
- OPAC_REG_VERIFY (missing)
Norwegian
- RENEWAL (present, but not translated)
- ISSUESLIP (missing)
- ISSUEQSLIP (missing)
- RESERVESLIP (missing)
- TRANSFERSLIP (missing)
- OPAC_REG_VERIFY (missing)
To test:
- Install Norwegian and German* translations
- Run through the web installer in German, making sure that
the sample letters are selected
- Check that there are no errors in the web installer
- Check <intranet>/cgi-bin/koha/tools/letter.pl - that the
letters look OK, and are translated
- Repeat the process for Norwegian
* = I had some problems with installing the German
translations that are in master, but now I can't reproduce
it. If you run into a problem where only some of the
subdirectories of koha-tmpl/intranet-tmpl/prog/de-DE/modules/
are cerated, try downloading and installing the 3.10 .po
files from Pootle.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit
58f42441bc8135ba2e322a6c6904c103682bac48)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Marcel de Rooy [Wed, 3 Apr 2013 14:36:25 +0000 (16:36 +0200)]
Bug 9986: Two fixes for Z3950 search
Searching for stdid: Standard ID, srchany: RAW (any) somehow did not work
anymore.
Probably my fault :) Note that these two fields are in Cataloging Z3950 search
and not in Acquisition.
Fixing encoding problems: When adding -utf flag for CGI in acqui/z3950 and
cataloging/z3950, the decoding statements in C4/Breeding, Z3950Search should be
removed.
Test plan:
Search in Cataloging with:
Standard ID:
9782358670043 on LOC
RAW (any): musee [add an accent aigu on first e] on LOC -- Add diacritic!!!
Search in Acquisition
Somewhere, does not matter, but use a diacritic.
A note: My git version still has a hard time with utf8. Need to upgrade to version 1.7.10 to resolve this..
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: Work as described. No errors
Without patch z39.50 search for example Std ID OR musee gives no results,
with patch there are.
No problems in acq search.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Good catch, passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Mon, 15 Apr 2013 12:36:15 +0000 (08:36 -0400)]
Merge branch 'bug_9591' into 3.12-master
Chris Cormack [Mon, 8 Apr 2013 09:20:51 +0000 (21:20 +1200)]
Bug 9591 : Set Library changes after viewing Holds Queue >> reserves item
To test
1. Log in to the staff client. Note your logged in library.
2. Navigate to Circulation -> Holds queue.
3. Select a holds queue report for a library other than your own.
4. From the holds queue report page, click the "Check out" tab and
enter the card number of a patron who has holds.
5. On the circulation page for that patron, click the "Holds" tab.
6. Click one of the titles in the list of holds.
Your logged in branch will now match the library you chose for the
holds queue report.
Alternate sequence:
4. From the holds queue report page, click the "Check out" tab and
do a non-exact search (search which will return more than one result)
for a patron who has holds.
5. Choose the correct patron from the list of results.
Your logged in branch will now match the library you chose for
the holds queue report.
Apply the patch and repeat, this time it should not change your logged
in branch
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Weird bug, the patch works for me.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Good catch. All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Mon, 15 Apr 2013 12:31:44 +0000 (08:31 -0400)]
Merge branch 'bug_9933' into 3.12-master
Chris Cormack [Mon, 8 Apr 2013 08:43:45 +0000 (20:43 +1200)]
Bug 9933: Unable to edit or add rules for any branch except default
To test
1/ Select a branch in circ rules
2/ Edit or add a rule, note this change is made for default instead of
the library you selected
3/ Apply the patch
4/ Try 1 and 2 again
Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Works as expected.
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Kyle M Hall [Wed, 3 Apr 2013 17:05:52 +0000 (13:05 -0400)]
Bug 8770 - amount does not equal amountoutstanding on a fine with no payments or credits
If a lost item fee is owed and partially paid off when an item is
returned and a refund is processed, Koha tries to pay off existing
fees before adding any leftover balance as a credit on the account.
However, those fee payments aren't actually processed, due to a bug
where the accountnumber was quoted as a string literal, and thus the
for the fee payment would fail. This did not result in an DB error,
as the query was still valid SQL. Checking the return value of the
query would have revealed that the accountline had not been updated.
History:
This bug was introduced on April 23, 2007 with the commit
'reintroducing fixaccountforlostandreturned as requested by rosalie'.
Commit id
111d590e9cdaf801256822e23f170bfc2365338f
On July 30, 2009 the error was flagged with a FIXME and remained
in that state until now.
Commit id
51e8fc2cb6a0cf79f19206c822a4361aeca6f63f
Test plan:
1) Create a test patron
2) Check out an item to that patron and give it a due date in the past
3) Run fines.pl to generate the fine for the item
4) Mark the item long overdue on the item tab (not in edit items)
5) Pay for the lost item
6) Check the item back in
7) Note the incorrect fines. Only the lost fee balance due is refunded,
not the entire lost fee, but no other fees are paid off.
8) Apply the patch
9) Repeat steps 1-6, then not the fines are paid correctly
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Totel due is correct after applying the patch.
All tests and QA script pass.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Jared Camins-Esakov [Sun, 7 Apr 2013 17:49:09 +0000 (13:49 -0400)]
Merge branch 'bug_9381' into 3.12-master
Jared Camins-Esakov [Sun, 7 Apr 2013 17:48:46 +0000 (13:48 -0400)]
Bug 9381: Increment version number
Database update for bug 9381 has been given version 3.11.00.202
Bernardo Gonzalez Kriegel [Sat, 16 Feb 2013 15:43:31 +0000 (12:43 -0300)]
Followup 2 - Bug 9381 - Add Catalan language
Sorry, this followup fulfills K. Fischer request to
base de-DE file in english one.
The differences are small corrections and added languages.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Rebased to master
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Bernardo Gonzalez Kriegel [Sat, 16 Feb 2013 15:28:05 +0000 (12:28 -0300)]
Followup Bug 9381 - Add Catalan language
This followup adds Catalan language into languages
other than english.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Rebased to master
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Bernardo Gonzalez Kriegel [Sun, 13 Jan 2013 02:23:33 +0000 (23:23 -0300)]
Bug 9381: Add Catalan language
Simply add catalan language.
No translation yet, so can't be really tested.
But it will come soon.
Until then, to test:
1) cp misc/translator/po/es-ES* to ca-ES*
2) do perl translate install ca-ES,
3) apply the patch
4) run updatedatabase.pl
5) enable language and display on system preferences.
6) check labels
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Rebased to current master
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Sun, 7 Apr 2013 17:44:37 +0000 (13:44 -0400)]
Merge branch 'bug_9812' into 3.12-master
Tomas Cohen Arazi [Wed, 13 Mar 2013 17:24:20 +0000 (14:24 -0300)]
Bug 9812 - Forbid access to several files through the browser
This patch hides (-Indexes) and forbids (Deny from all) access to some stuff through a browser.
Specifically "xlst", "modules" and "includes" dirs and its contents.
This is just a quick fix we talked about at IRC. The proper solution would be to remove this from htdocs which will still be needed.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
I do not have an installation that uses Apache at this point, but the
changes look correct and this was signed off and QAed by Chris and
Jonathan, both of whom have Apache installations.
Jared Camins-Esakov [Sun, 7 Apr 2013 17:38:10 +0000 (13:38 -0400)]
Merge branch 'bug_8200' into 3.12-master
Katrin Fischer [Sun, 7 Apr 2013 12:15:14 +0000 (14:15 +0200)]
Bug 8200: Follow up - Removing unused file stats.pl
Patch removes misc/translator/stats.pl that is no
longer used and references deleted script
update.pl in same directory.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Chris Cormack [Sun, 24 Mar 2013 06:08:11 +0000 (19:08 +1300)]
Bug 8200 - removing misc/translator/update.pl - deprecated file
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch removes unused file.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Sun, 7 Apr 2013 17:34:15 +0000 (13:34 -0400)]
Merge branch 'bug_7853' into 3.12-master
Mason James [Tue, 2 Apr 2013 08:20:12 +0000 (21:20 +1300)]
Bug 7853 - opac-maintanance.pl should correctly redirect back to opac-main.pl, if no updates are outstanding
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Works exactly as it should according to the test plan. This is a nice
improvement.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Amended patch: Check OpacMaintenance!
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Sun, 7 Apr 2013 17:30:57 +0000 (13:30 -0400)]
Merge branch 'bug_9459' into 3.12-master
Owen Leonard [Wed, 23 Jan 2013 15:57:09 +0000 (10:57 -0500)]
Bug 9459 [Revised] Use DataTables on hold ratios report page
Replace the tablesorter plugin with the DataTables plugin on the
hold ratios report page.
To test, open the hold ratios report (Circulation -> Hold ratios).
Confirm that table sorting works correctly.
Revision adds correct pagination options and natural sort for 'items
needed' column.
Patch now depends on Bug 9431
(http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=9431) which
introduces the natural sort plugin.
Further revision corrects template path to datatables assets.
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Comment: On top of Bug 9431. Sorting works. No errors.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Sun, 7 Apr 2013 17:28:19 +0000 (13:28 -0400)]
Merge branch 'bug_9850' into 3.12-master
Nicole C. Engard [Tue, 2 Apr 2013 12:31:10 +0000 (08:31 -0400)]
Bug 9850: FOLLOW UP: Add Missing Plugin Help for 3.12
This patch is a follow up to the one that adds the plugin help.
To test:
Visit the upload a plugin page and review the help and links.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Fixed capitalization issues.
Nicole C. Engard [Sat, 30 Mar 2013 17:40:08 +0000 (13:40 -0400)]
Bug 9850: Update Tools Help for 3.12
Update the text and links in the Tools help files.
To test:
Check the text and links on all help files under Tools.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
I fixed one instance of a link to 3.10 instead of 3.12.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Nicole C. Engard [Sat, 30 Mar 2013 17:42:40 +0000 (13:42 -0400)]
Bug 9850: Add Plugin Help File for 3.12
This adds a help file to the new plugins module.
To test:
Activate the plugin module and check the text and links in the help file
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Nicole C. Engard [Sat, 30 Mar 2013 16:23:49 +0000 (12:23 -0400)]
Bug 9850: Update Circ Help Files for 3.12
This updates the text and links for the Circulation Help Files. It also removes
an unused help file 'billing.tt'.
To test:
Visit the help files on all circ pages and confirm links and text are right.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Nicole C. Engard [Sat, 30 Mar 2013 15:25:36 +0000 (11:25 -0400)]
Bug 9850: Offline Circ Help Files for 3.12
This updates the text and links in the offline circulation tool help files.
To test:
Visit all offline circulation pages in the staff client and review the text and links.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Nicole C. Engard [Sat, 30 Mar 2013 14:36:02 +0000 (10:36 -0400)]
Bug 9850: Suggestion Help File for 3.12
This updates the text and link on the suggestions help file.
To test:
Visit the manage suggestions page and review the help file.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Nicole C. Engard [Sat, 30 Mar 2013 14:18:24 +0000 (10:18 -0400)]
Bug 9850: Serial Help Files for 3.12
Update text and links for Serials help files.
To test:
Visit all serial related pages and check the text of the help and
test the links.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Nicole C. Engard [Sat, 30 Mar 2013 14:14:06 +0000 (10:14 -0400)]
Bug 9850: Update Reports Help for 3.12
This updates the reports help for Koha 3.12.
To test:
Visit all reports pages and review the help for textual changes
and correct links.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Nicole C. Engard [Sat, 30 Mar 2013 13:35:14 +0000 (09:35 -0400)]
Bug 9850: Cataloging Help for 3.12
This updates just the links in the cataloging help, no text changes where made.
To test:
Visit help in cataloging and click the manual links and make sure they're right.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Sun, 7 Apr 2013 17:20:40 +0000 (13:20 -0400)]
Merge branch 'bug_9902' into 3.12-master
Kyle M Hall [Wed, 27 Mar 2013 13:18:24 +0000 (09:18 -0400)]
Bug 9902 - item subfields not populating
Test Plan:
1) Create a new serial with a default location, call number, and library
( the library will need to be any but the one you are logged in as )
2) Click the "Recieve" button for this serial
3) Click "Click to add item"
4) Note those values are not populated
5) Apply the patch
6) Reload the page
7) Click "Click to add item"
8) Note those values are now populated
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
All tests pass!
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
This seems to restore the former behaviour.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Sun, 7 Apr 2013 17:08:31 +0000 (13:08 -0400)]
Merge branch 'bug_7449' into 3.12-master
Fridolyn SOMERS [Fri, 22 Feb 2013 09:14:15 +0000 (10:14 +0100)]
Bug 7449: billingplace and freedeliveryplace not saved when creating a new basketgroup
billingplace and freedeliveryplace are missing in C4::Acquisition::NewBasketgroup.
Test plan :
- Go to a vendor basket groups
- Create a new basket group
- Enter a name
- Choose a billing place
- Do not choose a delivery place in combobox but enter a text in delivery place textarea
- Enter a comment
- Save
- Edit created basket group
=> Check that billing place and free delivery place are ok
Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works according to test plan, delivery place is now
correctly saved into the databas and was before lost.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Sun, 7 Apr 2013 16:52:23 +0000 (12:52 -0400)]
Merge branch 'bug_8061' into 3.12-master
Karam Qubsi [Fri, 5 Apr 2013 19:47:08 +0000 (22:47 +0300)]
Bug 8061: Follow Up (Opac-Prog) - enhancement to D Ruth's patch
In this Patch I added some changes to the rtl.css file
I made some changes in the file opac-bottom.inc and add css
classes to the lang list and I define the class value in
the opac.css
I add If statment to the opac-detail.tt to chose the rtl.css
when rtl lang.
http://bugs.koha-community.org/show_bug.cgi?id=8061
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Reformatted commit message and added bug number.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tested with po files for Arabic from 3.8.
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Karam Qubsi [Fri, 5 Apr 2013 10:07:43 +0000 (13:07 +0300)]
Bug 8061: Follow up - RTL CSS overrides (staff client)
I think this patch is good for th rtl langs.
and based on what D.Ruth send before, I added some edits
as a right to left reader.
Tested on master with Arabic
I used the updated po files for v. 3.8 (because the 3.12 )
need some revision ...
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
D Ruth Bavousett [Fri, 5 Apr 2013 14:58:33 +0000 (17:58 +0300)]
Bug 8061: RTL CSS overrides (OPAC)
This patch repairs a few things in templates and CSS to allow
for the injection of right-to-left CSS, also in this patch.
It should apply to 3.8 and master.
To test, install and enable a right-to-left language for the
OPAC, currently Hebrew or Arabic.
The Arabic OPAC translations for 3.6 are mostly-complete, so
they are a good test case.
It's helpful to have a reader of the language handy, but the
layout should be easy enough to figure out, even for
non-readers.
Signed-off-by: Karam Qubsi <karamqubsi@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Amended patch adding back author and adding sign off.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
D Ruth Bavousett [Fri, 5 Apr 2013 09:41:25 +0000 (12:41 +0300)]
Bug 8061: RTL CSS overrides (staff client)
This patch tweaks a few templates, and enables right-to-left
flipping via CSS in the staff client.
Signed-off-by: Karam Qubsi <karamqubsi@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Amended patch, putting back author and adding sign off.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Sun, 7 Apr 2013 16:15:11 +0000 (12:15 -0400)]
Merge branch 'bug_9980' into 3.12-master
Chris Cormack [Sun, 7 Apr 2013 07:55:37 +0000 (19:55 +1200)]
Bug 9980: Fix for anonymous searches
To test
Search in the OPAC both logged and logged out
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
When I turn off XSLT for the OPAC I can recreate the problem.
After applying the patch things work as expected for all
combinations of:
- Search results and detail view
- Logged in and not logged in
- XSLT and non-XSLT view
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests, QA script and test plan.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Wed, 3 Apr 2013 11:16:08 +0000 (07:16 -0400)]
Merge branch 'bug_9981' into 3.12-master
Owen Leonard [Tue, 26 Mar 2013 14:19:58 +0000 (10:19 -0400)]
Bug 9981: Handle sort1 field when duplicating patron
It is noted in Bug 5432 that during a duplicate operation one field,
'Sort1' does not automatically clear when the cursor moves into it. This
patch corrects this.
Edit a patron record to have data in the Sort1 and Sort2 fields. Perform
a duplicate operation on this patron and confirm that the Sort1 and
Sort2 fields show the information from the original patron record. When
you click on each field the contents should disappear.
Signed-off-by: David Cook <dcook@prosentient.com.au>
Works as described.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Wed, 3 Apr 2013 11:09:22 +0000 (07:09 -0400)]
Merge branch 'bug_4862' into 3.12-master
Liz Rea [Wed, 27 Mar 2013 03:14:43 +0000 (16:14 +1300)]
bug 4862 - Change label of Browse by subject or author to Authority search
Replicate:
Load the OPAC
You should see "Browse by Subject or Author right below the search box
To test:
Apply patch
Load the OPAC
You should see "Authority search" where "Browse by Subject or Author" was .
Signed-off-by: Mason James <mtj@kohaaloha.com>
Amended patch: change strings in opac-authorities-home.tt
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Wed, 3 Apr 2013 11:03:52 +0000 (07:03 -0400)]
Merge branch 'bug_9683' into 3.12-master
Fridolyn SOMERS [Thu, 21 Feb 2013 14:26:32 +0000 (15:26 +0100)]
Bug 9683: Allow disable rewrite apache mod
In Apache config koha-httpd.conf, URL-rewriting is enabled and does not
allow to disable mod_rewrite. Also, first rewriting rule
"RewriteRule (.+) $1?%1%2 [N,R,NE]" is enabled by default. This rule
rewrites nearly every URL. I propose to comment it in sources so that is
must be intentionally enabled.
This patch sets rewriting options into a conditional tag.
Test plan :
Test OPAC and intranet with and without mod_rewrite activated.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
The new Apache configuration seems to work fine (or at least as "fine"
as Apache gets) both with and without mod_rewrite enabled.
Jared Camins-Esakov [Wed, 3 Apr 2013 10:16:29 +0000 (06:16 -0400)]
Merge branch 'bug_9877' into 3.12-master
Jonathan Druart [Wed, 27 Mar 2013 15:02:36 +0000 (16:02 +0100)]
Bug 9877: Followup: FIX if the table is empty.
If there is no data, we don't display the table.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Owen Leonard [Wed, 20 Mar 2013 19:16:59 +0000 (15:16 -0400)]
Bug 9877 - Use DataTables on funds administration page
Replace the tablesorter plugin with the DataTables plugin on the funds
administration page.
To test, open the funds administration page (Administration ->
Funds). Confirm that table sorting, paging, and searching works
correctly.
Note that the table is sorted only when hierarchical display of parent
and child funds is not enabled. When the hierarchicial display is
enabled the table sorter is not triggered.
Signed-off-by: Pierre Angot <tredok.pierre@gmail.com>
Post-QA revision adds handling for empty table: "No funds" row must have
same number of cells as the rest of the table (including hidden cell);
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Wed, 3 Apr 2013 10:12:14 +0000 (06:12 -0400)]
Merge branch 'bug_9970' into 3.12-master
Owen Leonard [Tue, 2 Apr 2013 13:11:41 +0000 (09:11 -0400)]
Bug 9970 - Add datepicker default configuration to OPAC patron entry form
The datepicker on the OPAC patron entry/update form
(opac-memberentry.pl) doesn't show a calendar icon. This is because
although there is in-page JS to trigger the widget, the page doesn't
include the file which sets some widget defaults, including the path to
the calendar icon and the translatable strings for calendar labels.
This patch simply adds calendar.inc to the template.
To test, load the patron entry/update form (click "personal details" for
an existing patron or a start new patron registration). The date of
birth entry field should show a calendar icon.
Signed-off-by: David Cook <dcook@prosentient.com.au>
Test plan works as described. Looks much better.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Wed, 3 Apr 2013 10:09:08 +0000 (06:09 -0400)]
Merge branch 'bug_9535' into 3.12-master
Chris Nighswonger [Tue, 2 Apr 2013 14:05:46 +0000 (10:05 -0400)]
Bug 9535 - Patron card creator "Remove duplicates" function doesn't work
This bug was due to a difference in field names used in the item data
for items versus patrons. This patch adds a ternary to discern between
the two.
To test:
Before applying patch:
1. Create a batch of patroncards with one duplicate.
2. Run the de-duplication on the batch.
3. Note that all patrons beyond the first in the batch are now
deleted.
After applying patch:
4. Repeat steps 1-2.
5. Note that only the duplicate patron is removed.
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Tested successfully with both patron card batches and label batches.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Add indentation for readability
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Jared Camins-Esakov [Wed, 3 Apr 2013 10:02:13 +0000 (06:02 -0400)]
Merge branch 'bug_9971' into 3.12-master