Commit graph

14177 commits

Author SHA1 Message Date
Chris Cormack
ce06b67f5e Merge remote branch 'kc/new/bug_6126' into kcmaster 2011-04-13 12:01:53 +12:00
97712c2cca Bug 6126: Slip print doesn't work on Webkit based browsers
Wrap window.print();window.close(); with a function called when body has finished loading. Prevents webkit from closing before page is loaded and print dialog presented to the user.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-13 12:00:31 +12:00
Colin Campbell
f11ba1343c Bug 6174: Fix ordering of existing title
basketno was treated as local to the resultsloop
also changed the tt variable name for readability

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-13 11:56:52 +12:00
Chris Cormack
25d6beb805 When running the tests a user is not logged in so C4::Context->userenv
does not exist, stopping the tests erroring
2011-04-13 11:52:28 +12:00
c9d082bcdc Bug 5067 Add a cleanisbn param to bulkmarcimport.pl
Import script shouldn't remove an information present in entering biblio
records. With this patch, by default, ISBN are not cleared anymore.

[2011.04.12] Rebased on HEAD

DOCUMENTATION: There is a new paramater --isbn|--noisbn

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-13 11:41:04 +12:00
Colin Campbell
2ea74bef65 Bug 6170: restore more options to staff adv search
Some globals were assigned as search box attributes in conversion
causing elements to be suppressed

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-13 10:57:18 +12:00
Colin Campbell
b8384c95ee Bug 6170 restore more options to advanced search
Template conversion was treating some globals as attributes of searchbox

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-13 10:57:18 +12:00
Colin Campbell
8b309c6624 Bug 6170: Do not prematurely group results
If OPACGroupResults preference was set it was
shortcircuiting the template selection logic and
we didn't go to the advanced options field

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-13 10:54:22 +12:00
Chris Cormack
6073bd86e2 Merge remote branch 'kc/new/enh/bug_5917' into kcmaster 2011-04-13 08:35:41 +12:00
Christopher Hall
1d3273595c comma fix 2011-04-13 08:34:15 +12:00
Jared Camins-Esakov
f08f67d3f1 Bug 6169: Inventory tool fails when ignoreissued set
Due to incorrect parameters passed to C4::Items::GetItemsForInventory, checking
the "Skip copies on loan" box resulted in the inventory failing to run.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-12 22:19:05 +12:00
Chris Cormack
50dcc32876 Merge remote branch 'kc/new/enh/bug_5917' into kcmaster 2011-04-12 20:18:20 +12:00
Chris Cormack
8df93d61bc Bug 5917 : Fix for xgettext.pl 2011-04-12 20:16:57 +12:00
dfa4127db1 Bug 6171 Can't edit items
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-12 19:52:00 +12:00
Jared Camins-Esakov
9475752f3a Bug 2505: quiet warnings in tools/inventory.pl
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-12 09:57:46 +12:00
Chris Cormack
27b559e495 Bug 6163 : Fixing typo in updatedatabase 2011-04-12 09:41:53 +12:00
2c82c8e905 Fix for Bug 6162, name missing on reading history in opac
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-12 09:33:14 +12:00
Colin Campbell
b993d2d231 Bug 6164 Send Borrower Data to template consistently
messaging and notices patron tabs were not passing borrower
info in a manner consistent with other tabs

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-12 09:30:33 +12:00
9f7542dbab Fix for Bug 6159 - Variable scope errors prevent placing holds in the OPAC
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-12 09:27:37 +12:00
3c8536a398 Fix for Bug 6160, my details not showing tabs
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-12 09:19:44 +12:00
Jared Camins-Esakov
66fb80f436 Bug 6158: Permissions scoped wrong for T::T
Permission flags should always have absolute scope.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-12 09:16:27 +12:00
Salvador Zaragoza Rubio
6668bf06f8 Bug 6167 - can't use 008 or 006 plugin in cataloging
Due to changing to T-T $template->pama("lang") return undef,
now is $template->{param} the right value.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-12 09:12:09 +12:00
Chris Cormack
6152b624f7 Merge remote branch 'kc/new/enh/bug_5431' into kcmaster 2011-04-12 08:57:37 +12:00
Chris Cormack
ce1b47ce0b Bug 5431 : Follow up patch fixing ModBranch
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-12 08:55:20 +12:00
Chris Cormack
79ec08b479 Adding 2 more developers to the history, 141 now 2011-04-11 23:34:37 +12:00
Chris Cormack
88f0c4cb45 Bug 6155 : Fixing bug with lists not showing
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-11 22:42:57 +12:00
Chris Cormack
c330b683bc Merge remote branch 'kc/new/enh/bug_5917' into kcmaster 2011-04-11 21:13:05 +12:00
Chris Cormack
3fdf627c19 Bug 5917 : Fix for translating XSLT
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-11 21:12:10 +12:00
Chris Cormack
02a3740200 Merge remote branch 'kc/new/bug_6085' into kcmaster 2011-04-11 20:47:50 +12:00
Colin Campbell
46488bfc2e Bug 6085: Fix typo in earlier patch
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-11 20:47:19 +12:00
Chris Cormack
241846c62c Bug 5917 : Fixing the translation script
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-11 20:37:31 +12:00
Chris Cormack
961e9fec87 Bug 5917 : Fixing a bug with categorie.tt
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-11 16:37:49 +12:00
Chris Cormack
7efaafe132 Bug 6085 : Fixing the utf8 weirdness
I am not very happy with this fix, but it does mean the template are
translatable and we don't get double encoding issues with them anymore

Please test

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-11 16:01:59 +12:00
Chris Cormack
256cc9196c Bug 6085 : setting the binmode broke the files rather than fixing them
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-11 14:47:25 +12:00
Chris Cormack
5a23a45e32 Bug 6085 : utf8 fixed for xslt, and parameters, broken for utf8 included in templates
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-11 12:58:05 +12:00
Chris Cormack
312386be6e Bug 6085 : Fixing missing last tag in translation and comments, utf-8 issues to fix now
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-11 12:58:05 +12:00
Chris Cormack
297649c8ec Bug 6085 : Can now change language in the preferences menu
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-11 12:58:04 +12:00
Jared Camins-Esakov
6e2260c739 Bug 5917 follow-up: Fix errors on OPAC results
This patch fixes the following problems with the OPAC search results:
* The facet links were constructed wrong following the change to
  Template::Toolkit

This patch also changes the OPAC sorting dropdown to work in the same way as the
staff dropdown. This seemed preferable to having the two use different variables
for deciding which option to select, and it is unclear why Search.pm was not
passing the appropriate variables to the staff client.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-11 08:27:40 +12:00
Jared Camins-Esakov
f1e96f4590 Bug 5917 follow-up: Fix staff client results display
The change to Template::Toolkit broke a number of things on the Staff Client
results display. This patch:
* Fixes the formatting of the results table, which had an unnecessary colspan=2
* Enables the display of the "Edit record" and "Edit items" links
* Corrects the display of item counts, so that labels for "Available,"
  "On loan," and "Unavailable" only appear when appropriate
* Corrects facet links, which were starting new searches rather than limiting
  due to a variable scoping error
* Changes the resort dropdown so that it will show the currently-selected
  sorting

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-11 08:27:40 +12:00
Jared Camins-Esakov
e766a92b98 Bug 5917 follow-up: Quiet errors in C4::Templates
There were a few errors about unitialized variables in C4::Templates.

Signed-off-by: Jared Camins-Esakov <jcamins@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-11 08:27:38 +12:00
Chris Cormack
82f0fee5c8 Bug 5917 : Fixing a bug with switching languages
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-10 22:58:08 +12:00
Chris Cormack
2fc830acff Updating database version 2011-04-10 22:14:46 +12:00
Chris Cormack
35b338412b Merge remote branch 'kc/new/enh/bug_5917' into kcmaster 2011-04-10 21:51:26 +12:00
Chris Cormack
bacd210c73 Bug 5917 : Updating dependencies 2011-04-10 21:50:35 +12:00
Chris Cormack
f12406b076 Merge remote branch 'kc/new/enh/bug_5917' into kcmaster 2011-04-10 21:08:48 +12:00
Srdjan Jankovic
7882911799 bug 6031: play with options passed on to rebuild-zebra.pl
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-10 20:53:00 +12:00
Chris Cormack
5884fb1000 Bug 5917 : Swapping templates over 2011-04-10 20:38:30 +12:00
Chris Cormack
d4cd05126d Bug 5917 / Bug 6085 : Fixing not being able to change language 2011-04-10 20:22:55 +12:00
Chris Cormack
f91441f5f5 Bug 5917 : Catching pref,css and js changes 2011-04-10 20:05:41 +12:00
Chris Cormack
ec16c3a092 Bug 5917 : Updating templates 2011-04-10 20:00:27 +12:00