Commit graph

11710 commits

Author SHA1 Message Date
4bade723ef Revert "(bug #3778) GetBranchesLoop and searchMyLibraryFirst"
Reverting this commit to resolve bug 4016.  This revert has the
same effect as a patch submitted by Garry Collum on 20 February 2010.

This reverts commit 2345dc7c27.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-21 18:04:15 -05:00
Michael Hafen
43c0277ac5 Bugfix Makefile.PL check for dollar signs
Missed the lines where dollar signs are quoted for DB_PASS and ZEBRA_PASS.
Don't need to quote (double-quote) those two lines now.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-20 17:56:02 -05:00
Michael Hafen
62f43c04e9 Add instructions to INSTALL and README.robots about robots.txt
Instructions are given in INSTALL and README.robots about adding a robots.txt
file to the opac to prevent search engines from indexing Koha.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-20 17:55:59 -05:00
e4210cdbc7 Bug 3609 Fix fr-FR user permissions
- Translation
- Add missing permissions: execute_reports, create_reports
- Rename properly: batchmod and batchdel

This has to be done for other languages.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-20 17:51:15 -05:00
46b4f60255 Add pl-PL to syspref test
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-20 17:51:11 -05:00
597bb1bb65 Bug 3609 Test for user permissions translated values
This new test identifies incoherences between 'en' user permissions and
translated versions.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-20 17:51:06 -05:00
d38a716fc1 Removing bogus style declaration
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-20 17:51:01 -05:00
Nicole Engard
b86c58d5c6 move ReservesMaxPickUpDelay to Holds Policy on Circ Prefs
This preference didn't make sense in Interface - it's a holds
policy related preference and so I've moved it to that area.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-19 09:59:07 -05:00
c12ff97647 bug 3242 follow-up: fix crash when emailLibrarianWhenHoldIsPlaced is ON
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-19 05:56:44 -05:00
752d1c712f bug 4182: add emailLibrarianWhenHoldIsPlaced to preferences editor
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-19 05:51:47 -05:00
d82bc5f0ce bug 3242: insert new HOLDPLACED letter template (DBrev 124)
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-19 05:47:50 -05:00
Nahuel ANGELINETTI
8168ccb4c7 (bug #3242) send email when hold is placed
[cherry-picked from 3.0.x]

This add a new letter in database, and each time a new hold is placed, a new mail is enqueued.

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
2010-02-19 05:41:08 -05:00
ab54b07ad6 bug 2970: extend new hold priority change permission
Now covers the new hold request priority buttons.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-19 05:23:42 -05:00
c411928b12 bump to DBrev 123
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-19 05:13:45 -05:00
e31b7bd9a5 Fix for Bug 2970, Create a permission for modifying holds priority
Adding two new granular permissions under 'reserveforothers,' place_holds
and modify_holds_priority. If a user does not have modify_holds_priority
permission, the option to change the priority of a hold is hidden.
Revised patch includes changes to mandatory data files including
properly translated fr-FR version.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-19 05:12:58 -05:00
Chris Cormack
a98e3da534 Whoops missed Magnus Enger
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-19 05:06:27 -05:00
3559d48bed bump DBrev to 122
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 23:05:28 -05:00
bd9ace1185 DBRev 122 — OAI Server fixes
- Add OAI-PMH:ConfFile.
- Suppress OAI-PMH:Subset which isn't is .pref file and was never used
  by OAI Server.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 23:05:04 -05:00
21c7f786bf bug 1532: various code cleanup
* export C4::Reserves::CancelExpiredReserves
* rename  misc/cronjobs/cancel_expired_reserves.pl
  to misc/cronjobs/holds/cancel_expired_holds.pl
* added cancel_expired_holds.pl to example crontab
* fix staff crash if AllowHoldDateInFuture is on
* expirationdate is now nullable instead of relying
  on 0000-00-00

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 22:49:48 -05:00
57869cb439 bug 1532: fix XHTML validation errors
Also changed some titles to use "hold" instead of "reserve"
for display purposes.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 22:49:48 -05:00
52fe58dd95 bug 1532: tweak new reserves columns and add to init SQL (DB rev 121)
Changed type of lowestpriority from BOOL to tinyint(1) - BOOL was likely
OK, but made it tinyint(1) to match the rest of the flag columns.  We
should look into converting those to BOOL en masse in 3.4.

Also made expirationdate nullable.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 22:49:47 -05:00
Kyle M Hall
3502810346 (bug 1532) Reserves Updates Ported From Dev_Week
This is a much improved re-implementation of the reserves updates from dev_week.
Less new code has been added, and more existing functions are used instead of adding new ones.

The 'Lock Hold' function has been removed due to it not working as intended.

[RM note for documentation: this adds the following features:

* ability to specify an expiration date for a hold request
  when placing it via the staff interface or OPAC
* daily batch job to cancel expired holds
* nice interface to change the priority of hold
  requests for a bib in the staff interface]

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 22:49:47 -05:00
Chris Cormack
6ded7fcfd3 Adding some clarity to the acquistion called off line in the history
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 21:17:46 -05:00
Chris Cormack
8fbc3532e5 Updating credits and history document
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 21:17:39 -05:00
Garry Collum
b0c0840d99 Bug 2505: Enabled warnings in opac-userdetails.pl.
No warnings generated.

The only files left in koha/opac are changelanguage.pl and opac-user.pl.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 21:17:28 -05:00
Garry Collum
39dd21f926 Bug 4227: Removes unused opac-logout.pl.
Performed a recursive grep on the entire file structure to confirm.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 21:17:27 -05:00
5e83c889a7 bug 3825 followup: fix errors in template
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 16:35:32 -05:00
Nahuel ANGELINETTI
631a875de1 (bug #3825) improve waiting holds
[cherry-pick from 3.0.x]

This patch :
 * fix indentation
 * Separate waiting holds from holds over with tabs
 * Select only holds for librarian library

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 16:14:21 -05:00
9074faee25 Fix for Bug 4219, strange artifacts showing on lists in the staff client
Recent change to C4/VirtualShelves/Page.pm caused display of subtitles
to break in the staff client display of lists

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 15:21:47 -05:00
964206af2e Revert "bug 3765: move road type after address"
Reverted at patch submitter's request - see bug 3765
for details.

This reverts commit 3b8542bbfe.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 14:03:22 -05:00
Michael Hafen
e752822d04 bugfix Guided Reports - allow user specified limit in sql
Tweak the regular expression in strip_limit to work.
Tweak execute_query to use the user limit if it's lower than the hard coded one.
Also total is calculated somewhere else now.

This helps most with the csv export of a report so the user can set their own
limit instead of having the hard coded limit of 9999.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 13:52:18 -05:00
Michael Hafen
0d2095072e add memcached questions to koha-install-log
Add the use_memcached question to rewrite-config.pl and all three questions
to koha-install-log.  So that we don't have to keep answering these questions
when we upgrade/install with the --prev-install-log option.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 13:46:55 -05:00
Michael Hafen
40980d44d6 have Makefile.PL check for dollar signs
Make treats any $ as an internal variable except $$.  So have Makefile.PL when
getting values turn any $ into $$.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 13:42:33 -05:00
b4ce64bff4 Revert "Add basic restrictive robots.txt file to opac"
Per discussion on 12/9/2009, reverting.  I agree with Nicole Engard
that a restrictive robots.txt for the OPAC should *not* be the
default.  A patch for a README on how to do it would be nice, though.

This reverts commit 6822d69d95.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 13:23:49 -05:00
Ricardo Dias Marques
f9e63f33f5 Added Locale::PO dependency in Makefile.PL
In one of my setups, "install-code.pl pt-PT" complained
about a missing "Locale::PO". So, I'm adding it to
Makefile.PL. I'm using the version 0.17 as minimum
required because it's the one that's available in
Debian 5.0.2. ("lenny").

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 13:15:27 -05:00
a066cae6c5 bug 3651 followup: updated for new GetMember() parameter style
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 12:59:46 -05:00
Nahuel ANGELINETTI
96e7c92583 (bug #3651) sending baskets and shelves
this patch restrict the send of baskets and shelves to authenticated users only, and show their surname/firstname in the e-mail, so the receiver will know who sent the list.
(cherry picked from commit f87b755228)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 12:58:08 -05:00
e0b3d2e235 Some new and altered itemtype images for the NPL set
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 12:42:57 -05:00
8f965b95e4 Bug 4047 - Add a link to branch URL if available on holdings in OPAC
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 12:29:15 -05:00
Will Stokes
f27c5ae5a1 Display amount of credit patron has, not just that they have credit.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 12:18:03 -05:00
Jane Wagner
5b33873c21 Bug 4215 OPAC "Search for title in" can fail with trailing slashes in title
While configuring Search for Title In links, I found that some target sites
can't process an incoming title search if the title being sent has a trailing
slash.  If the same search is sent without the trailing slash, it works fine.  I
modified opac-detail.pl to strip off the trailing slash (and space) for titles
being sent to other sites.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 12:09:11 -05:00
3d16451ac5 bug 1080 follow-up: make sure 'sound' isn't listed as a language
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 12:06:59 -05:00
66aaf0726e update RM notes for new translation wrapper script
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 12:06:50 -05:00
3c3aac0848 Follow up for new translation wrapper
(cherry picked from commit 17bdeb66e041f295214d1406620669c090b4e4de)

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 11:43:42 -05:00
c05b7747b9 New wrapper script for handling translation process
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 11:39:24 -05:00
Garry Collum
999e78ac30 Bug 3070: Fixes RSS feed for single result search.
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 11:10:33 -05:00
Garry Collum
92bca53408 Bug 2505: Add warnings to opac/maintenance.pl
Added a FIXME for warning generated from C4/Context.pm.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 11:10:30 -05:00
Garry Collum
88a4648b15 Bug 4212: Adds license statement to opac-search.pl
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 11:10:29 -05:00
Colin Campbell
a034d305da bookseller is returned as a scalar hashref not an array
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 10:29:48 -05:00
Colin Campbell
ea7aa11d71 Make GetBooksellerFromId error return consistent
return undef or empty array in error cases
hopefully if we're consistent someone may start checking it
removed unnecessary ()s

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 10:29:47 -05:00