Owen Leonard [Tue, 24 Jan 2012 14:10:46 +0000 (09:10 -0500)]
Bug 7461 - Cart offering to remove items when closing
The "hide window" button in the cart called a quit() function
which deletes any checked items. My understanding of the "hide
window" button is that it should *only* hide the window, not
perform any other operations. I'm removing the calls to the
quit() function in both the OPAC and staff client and adding
a CSS class, "close," which is already tied via jQuery to
the window.close() function.
To test in both OPAC and staff client: Add items to the cart.
Try clicking the "hide window" button with items selected and
without. In both cases the window should close without affecting
the contents of the cart.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Frédéric Demians [Thu, 26 Jan 2012 09:39:52 +0000 (10:39 +0100)]
Bug 7472 Edit button ineffective when paying borrower fee
On payment page, the Edit button doesn't load anymore the current
borrower edit page.
To reproduce the bug:
- Define a borrower category 'foo' with Enrollment fee
- Create a new 'foo' borrower
- Click on Check out tab
- A message is displayed: Fees & Charges: Patron has Outstanding fees &
charges of xx.00. Checkouts are BLOCKED because fine balance is OVER
THE LIMIT. Make Payment
- Click on Payment link
- Click on Edit button
- You reach a page for creating a new borrower
=> you should reach the current borrower edition page
- Same issue on paycollect.tt template
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
MJ Ray [Mon, 30 Jan 2012 21:06:57 +0000 (21:06 +0000)]
Bug 7476 Remove executable bit from files that probably should not be executed
Signed-off-by: Aleksa Vujicic <aleksa@catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Amended to replace some copy-and-paste comments only with consent of MJR.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Marcel de Rooy [Mon, 9 Jan 2012 12:10:51 +0000 (13:10 +0100)]
Bug 7459 - Can only add to one public list in OPAC search results
This makes the second and higher public list appear again in the AddTo combo of the search results screen.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Garry Collum [Wed, 1 Feb 2012 15:15:46 +0000 (10:15 -0500)]
Bug 6984 - Holds statistics doesn't work.
This patch fixes several errors in reserves_stats.pl and reserves_stats.tt.
Testing -
To test this patch, data must be in either the reserves table or old_reserves or both. The following SQL will give you the raw data that is used by the report.
SELECT priority, found, reservedate, notificationdate, reminderdate,
waitingdate, cancellationdate, borrowers.categorycode, items.itype,
reserves.branchcode, holdingbranch, items.homebranch, items.ccode,
items.location, items.itemcallnumber, borrowers.sort1, borrowers.sort2
FROM reserves
LEFT JOIN borrowers on (borrowers.borrowernumber = reserves.borrowernumber)
LEFT JOIN items on (items.itemnumber = reserves.itemnumber)
UNION SELECT priority, found, reservedate, notificationdate, reminderdate,
waitingdate, cancellationdate, borrowers.categorycode, items.itype,
old_reserves.branchcode, holdingbranch, items.homebranch, items.ccode,
items.location, items.itemcallnumber, borrowers.sort1, borrowers.sort2
FROM old_reserves
LEFT JOIN borrowers on (borrowers.borrowernumber = old_reserves.borrowernumber)
LEFT JOIN items on (items.itemnumber = old_reserves.itemnumber)
To test the notificationdate and reminderdate, I added data to the old_reserves table, since I have never run notices on my test machine.
Ex:
UPDATE old_reserves
SET notificationdate = "2012-01-29",
reminderdate = "2012-01-29"
WHERE timestamp = "2012-01-29 20:09:34";
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Confirm original bug -- Reports work as expected now!
prove t xt t/db_dependent no different from master.
Paul Poulain [Fri, 3 Feb 2012 11:09:24 +0000 (12:09 +0100)]
bug 7450 small follow-up, removing warn
removing an unconditional warn. It was already here before the patch,
but my pre-applypatch script complained, so I fix as a follow-up
Adrien Saurat [Tue, 17 Jan 2012 11:00:32 +0000 (12:00 +0100)]
Bug 7450: missing placeholders in authorised_values.pl
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Successfully added, edited and deleted authorised values.
No problems found.
Garry Collum [Sat, 28 Jan 2012 19:36:18 +0000 (14:36 -0500)]
Bug 7431: Fixes the display of the due date in opac item specific holds.
Fixes the reference to the due date in opac-reserve from date_due to dateDue as defined int opac-reserve.pl.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Frédéric Demians [Wed, 14 Dec 2011 07:52:32 +0000 (08:52 +0100)]
Bug 7355 Note subfields are not displayed in TEXTAREA if hidden
In the data entry form, there is a (hidden) functionality for note subfields.
MARC21 500-599 and UNIMARC 300-399 subfields are displayed in TEXTAREA rather
than INPUT tags. This is good since usually notes can be pretty long. But if
one of those fields is marked in the framework as 'hidden', then it isn't
displayed at first when you create a record and when you expand the field by
clicking on its label the field is displayed in a one-line INPUT tag.
To reproduce this bug:
- Modify your framework:
MARC21: 500$a, hidden=1
UNIMARC: 300$a, hidden=1
- Create a new biblio record with this framework
- Open the tab containing 500 or 300 field
- 500 or 300 tab is collapsed
- Click on 500 or 300 label to expand the field
- 500$a or 300$a is displayed in a one-line INPUT tag, not in a TEXTAREA
as it should
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Test plan works. Also checked cloning and deleting
subfields still works.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Works as advertised. Simplifies code too. Well documented test plan.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Fri, 3 Feb 2012 08:19:04 +0000 (09:19 +0100)]
Merge remote-tracking branch 'origin/new/bug_6964'
Marcel de Rooy [Fri, 3 Feb 2012 07:46:39 +0000 (08:46 +0100)]
6964 Follow-up typo borrowenumber
Paul Poulain [Thu, 2 Feb 2012 17:17:42 +0000 (18:17 +0100)]
Merge remote-tracking branch 'origin/new/bug_7190'
Paul Poulain [Thu, 2 Feb 2012 15:22:36 +0000 (16:22 +0100)]
Merge remote-tracking branch 'origin/new/bug_6964'
Paul Poulain [Thu, 2 Feb 2012 15:22:24 +0000 (16:22 +0100)]
Bug 6964 follow-up
Seems everybody forgot to test paycollect, as there was a syntax error !
Paul Poulain [Thu, 2 Feb 2012 14:35:38 +0000 (15:35 +0100)]
Merge remote-tracking branch 'origin/new/bug_6210'
Paul Poulain [Thu, 2 Feb 2012 14:35:26 +0000 (15:35 +0100)]
Bug 6210 follow-up, removing warn
See http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6210#c27
and http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6210#c28
Paul Poulain [Thu, 2 Feb 2012 14:21:45 +0000 (15:21 +0100)]
Merge remote-tracking branch 'origin/new/bug_6488'
Paul Poulain [Thu, 2 Feb 2012 14:21:25 +0000 (15:21 +0100)]
Bug 6488 adding a 2nd \n to silence logs
YAML don't like when you try to open a YAML file with just a \n. This patch add a 2nd \n to silence logs.
Srdjan Jankovic [Tue, 31 Jan 2012 02:36:44 +0000 (15:36 +1300)]
bug_7190: Do not reverse writeoffs when item is returned
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Owen Leonard [Thu, 3 Nov 2011 14:22:11 +0000 (10:22 -0400)]
Fix for Bug 7148 - Add some error handling to Acquisitions' Z39.50 search to match Cataloging's
- Copying over error handling for timeout(10007) and refused(10000)
- Copying over error handling for submission with no targets chosen
- Correcting "cancel" link in the template which was not modified
when it was copied from cataloging's popup window template.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Thu, 2 Feb 2012 11:04:55 +0000 (12:04 +0100)]
Bug 7005 follow-up fix coding guidelines broken
Aleksa Vujicic [Thu, 19 Jan 2012 02:01:19 +0000 (15:01 +1300)]
Bug 7005: Writeoff all now has a confirmation dialog.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Aleksa Vujicic [Fri, 20 Jan 2012 03:00:19 +0000 (16:00 +1300)]
Bug 6964 - 'Add child' function should be dependant on system preference 'borrowerRelationship'
The 'Add Child' button is not shown if 'borrowerRelationship' is empty.
System preference description changed.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Thu, 2 Feb 2012 09:17:43 +0000 (10:17 +0100)]
Bug 6933 follow-up, perltyding new script list.pl
Owen Leonard [Wed, 28 Sep 2011 16:44:26 +0000 (12:44 -0400)]
Bug 6933 [REVISED] Add a view of titles with a particular tag to the staff client
- Adds a new page to the tags moderation section for viewing all the
titles tagged with a particular term.
- Adds display of approved tags to the catalog detail page matching the opac
view. Adding tags from the detail view not implemented.
Follow-up adds tags display to XSLT detail view
Areas for improvement:
- I think it would be better to show "Also tagged with:" and exclude
the current tag from the list of titles tagged with a particular tag.
- It would be nice to be able to show unapproved tags (and some idication of
their status) along with approved tags on the detail page if the user had
TagsModeration permission.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Jared Camins-Esakov [Sat, 8 Oct 2011 19:34:24 +0000 (15:34 -0400)]
Bug 6913: More options for koha-create and koha-remove
This commit makes koha-create more flexible by adding a number of command-line
and configuration options.
The biggest change is to add support for pre-determined MySQL credentials using
a file in /etc/koha/passwd (for security reasons, if you use this feature, make
sure the file is not world-readable). The configuration file has the following
format:
instance:user:password:database
The database is optional, but the other two are both required if you want to
specify MySQL credentials. If no credentials are specified for a given instance,
the standard koha_instance username and an auto-generated password are used.
The following additional command line options are now available:
* --use-db - use a pre-existing database, see also --database
* --database - specify the name of the mysql database (still defaults to
koha_instance)
* --passwdfile - specify a custom (Koha) passwd file for MySQL credentials
The following additional variables are now available (for use in
koha-sites.conf or a custom config file):
* OPACPORT (previously added but not documented) - port on which the OPAC
should be served
* OPACPREFIX - prefix for the OPAC's virtual host
* OPACSUFFIX - suffix for the OPAC's virtual host
This commit also adds the --keep-mysql option to koha-remove, which, if
specified, will prevent koha-remove from deleting the database or MySQL user
when removing an instance.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Robin Sheat [Sun, 25 Sep 2011 23:04:13 +0000 (12:04 +1300)]
Bug 6913 - change how ports are handled by koha-create
This does two things:
* Allows OPACPORT to be specified to change the default OPAC port,
* removes the port number from the ServerName directive, as it's already
handled by the VirtualHost declaration.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Paul Poulain [Thu, 2 Feb 2012 08:06:51 +0000 (09:06 +0100)]
Adding Jorgia Kelsey and Peter Lorimer as contributors
Paul Poulain [Wed, 1 Feb 2012 22:09:30 +0000 (23:09 +0100)]
Bug 6843 follow-up DBrev
Koustubha Kale [Wed, 14 Dec 2011 10:18:16 +0000 (15:48 +0530)]
Renew membership from expiry date or from current date based on a syspref
This patch adds a system preference under Patron -> BorrowerRenewalPeriodBase
Using this preference the patch allows renewal of Patron account either from todays date or from existing expiry date in the patrons account.
To test : Apply patch; Set System Preference BorrowerRenewalPeriodBase ( under Patron ) to "current membership expiry date";
Renew a patron; You will observe that patrons account expiry date has been calculated from previuos expiry date instead of today's date
( as is the default in Koha prior to this patch ).
Paul Poulain [Wed, 1 Feb 2012 17:23:16 +0000 (18:23 +0100)]
adding 3 contributors from catalyst OpenSource academy
they contributed tests
Paul Poulain [Wed, 1 Feb 2012 17:15:45 +0000 (18:15 +0100)]
Merge remote-tracking branch 'origin/new/bug_5327'
Robin Sheat [Wed, 1 Feb 2012 00:52:53 +0000 (13:52 +1300)]
Bug 5327 - move another test around
Chris Cormack [Mon, 30 Jan 2012 23:48:13 +0000 (12:48 +1300)]
Bug 5327: Shifting a db dependent test to the right place
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Paul Poulain [Wed, 1 Feb 2012 16:56:42 +0000 (17:56 +0100)]
bug 6631 follow-up adding author in contributors list
Aleksa Vujicic [Tue, 24 Jan 2012 01:09:34 +0000 (14:09 +1300)]
Bug 6631: Anonymous users can create lists in OPAC
Made opac-addbybiblionumber.pl page require authentication.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Wed, 1 Feb 2012 16:51:05 +0000 (17:51 +0100)]
Bug 6539 follow-up, fixing wrong indentation
Peter Lorimer [Thu, 30 Jun 2011 08:47:55 +0000 (09:47 +0100)]
Bug 6539 - When searching the catalogue, if I get no results then hit the Z39.50 search the title field in the pop up window is populated with what I searched for.
If I search for a valid ISBN number and hit the Z39.50 search, the title field
is populated with the ISBN number I searched for. This number should populate
the ISBN field and not the title field.
http://bugs.koha-community.org/show_bug.cgi?id=6539
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
To test:
- Search new ISBN using ISBN search from advanced search page
- 0 results - click on Z39.50 search
- Z30.50 form will have your ISBN in ISBN search option
I am signing off on this, because it's an improvement over the current
behaviour.
I see some problems though that should perhaps be addressed in a separate
bug or as a follow-up:
If you use th catalog search field and search for an ISBN or
a keyword the right fields of the Z39.50 search form will be populated, but
the search index will be put in front:
ISBN: kw,wrdl:
9783492251495
or
Title: kw,wrdl: koha testing
If you search for ISBN as keyword on the advanced search page, it will
still populate the Title search.
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Owen Leonard [Tue, 24 Jan 2012 15:44:11 +0000 (10:44 -0500)]
Bug 6210 - Follow up, Choose framework on merge
- Adding subtitle to the display of titles to be merged
- Adding a link to preview the MARC record of titles to be merged
- Fixing up markup of form to improve appearance
- Correcting breadcrumbs
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Srdjan Jankovic [Mon, 19 Dec 2011 06:22:49 +0000 (19:22 +1300)]
bug_6210: Select framework if merging two records with different frameworks
ModBiblio() - set framework to "" if "Default"
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
All 4 tests passed:
Test 1: Merge two records with the same framework
Desired result: shouldn't get any prompting to pick a framework, and the
same framework should be used
Test 2: 2 records, different frameworks, into the kept record's framework
Desired result: merge with kept records framework used
Test 3: 2 records, different frameworks, into the discarded record's
framework
Desired result: merge with used records framework used
Test 4: 2 records, different frameworks, into a third framework
Desired result: merge with third framework used
Srdjan Jankovic [Mon, 23 Jan 2012 04:04:02 +0000 (17:04 +1300)]
bug_6488: Take in account opachiddenitems when searching in opac
Changed searchResults() interface
Added trailing \n when parsing OpacHiddenItems to make YAML happy
XSLTParse4Display() and buildKohaItemsNamespace() take hidden
items as input param
Removed numbering from the search results, looks wrong with
hidden items
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Tue, 31 Jan 2012 16:30:28 +0000 (17:30 +0100)]
Merge remote-tracking branch 'origin/new/bug_5327'
Sam Sanders [Thu, 19 Jan 2012 01:15:45 +0000 (14:15 +1300)]
Bug 5327 added tests for C4/Languages.pm
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
Connor Dewar [Wed, 18 Jan 2012 02:33:43 +0000 (15:33 +1300)]
Bug 5327 Added unit tests for C4/SIP/ILS/Transaction/Renew.pm
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
Bart Jorgensen [Wed, 18 Jan 2012 23:08:58 +0000 (12:08 +1300)]
Bug 5327 added unit tests for C4/TmplToken.pm
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
Kate Henderson [Wed, 18 Jan 2012 22:24:00 +0000 (11:24 +1300)]
Bug 5327 added unit tests for C4/Search_PazPar2.pm
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
Sam Sanders [Thu, 19 Jan 2012 04:05:16 +0000 (17:05 +1300)]
added unit tests for C4/Serials.pm
http://bugs.koha-community.org/show_bug.cgi?id=5327
Kate Henderson [Thu, 19 Jan 2012 01:29:53 +0000 (14:29 +1300)]
Bug 5327 added unit tests for C4/Scheduler.pm
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
Sam Sanders [Wed, 18 Jan 2012 02:38:52 +0000 (15:38 +1300)]
bug 5327 added unit tests for C4/Ris.pm
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
Jono Mingard [Thu, 19 Jan 2012 01:31:57 +0000 (14:31 +1300)]
Bug 5327 added unit tests for C4/Creators/PDF.pm
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
Sam Sanders [Tue, 17 Jan 2012 20:39:55 +0000 (09:39 +1300)]
Bug 5327 added unit tests for C4/ClassSortRoutine/LCC
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
Jorgia Kelsey [Wed, 18 Jan 2012 23:30:05 +0000 (12:30 +1300)]
Bug 5327 added unit tests for C4/Barcodes_PrinterConfig.pm
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
Jono Mingard [Wed, 18 Jan 2012 22:03:59 +0000 (11:03 +1300)]
Bug 5327 added unit tests for C4/AuthoritiesMarc/MARC21.pm
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
Sam Sanders [Thu, 19 Jan 2012 00:53:15 +0000 (13:53 +1300)]
Bug 5327 added tests for C4/Labels.pm
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
Sam Sanders [Thu, 19 Jan 2012 03:18:48 +0000 (16:18 +1300)]
bug 5327 added unit test for C4/Csv.pm
Signed-off-by: Chris Hall <chrish@catalyst.net.nz>
Stéphane Delaune [Mon, 23 Jan 2012 15:06:47 +0000 (16:06 +0100)]
Bug 7460: Add template toolkit's FILTER html_line_break on opac details description's tab
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
D Ruth Bavousett [Sun, 15 Jan 2012 15:51:30 +0000 (07:51 -0800)]
Bug 7446: Redundant display of availablecount in results.tt in staff client.
This tiny patch removes a redunant display.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Owen Leonard [Tue, 6 Dec 2011 20:09:27 +0000 (15:09 -0500)]
Bug 3806 - Holidays table doesn't order by date correcly
Adding dateformat filter to JavaScript tablesorter
configurations.
Follow-up adds a custom date parser for dates without year ("01/10")
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested yearly repeatables under Calendar for all three date formats.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Christophe Croullebois [Sat, 10 Dec 2011 17:39:37 +0000 (18:39 +0100)]
Bug 7350: In neworderempty.pl duplicating an item does not preserve select box selections
cloneNode() does not preserve select box selections, I have created a function to duplicate them : "clone_with_selected".
It is included in "cloneItemBlock", that's all.
Now the values selected in ddl are duplicated as the imput-texts are.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Chris Nighswonger [Wed, 14 Dec 2011 19:22:48 +0000 (14:22 -0500)]
Bug 7359 - Begin migration to a new "Koha" namespace from the old "C4" namespace
The Koha namespace is for Perl modules that meet the following mandatory
conditions:
* use "strict" and "warning" pragmata
* include valid POD
* include complete and functioning documented test cases
* not create circular dependencies
* use Object Oriented (OO) style everywhere possible
* minimize exports
* maintain mod_perl, etc. compatibility
* separate data access methods from business logic
Modules in C4 can use (and are encouraged to use) routines in
the Koha namespace. Modules in Koha should not in general use C4
modules; any C4 module that is safe to be depended on by a Koha
module is a candidate for being renamed to Koha.
The advantage of carving out a new namespace is that it doesn't
require that we refactor the entirety of C4 to support persistance or
to untangle the dependency tree. Instead, the only C4 code we would
have to reimplement for the Koha namespace right away would be
authentication, basic session management, and basic output.
(Gratuitous use made of gmcharlt's recommendations found in the
post mentioned below.)
Related info:
http://lists.koha-community.org/pipermail/koha-devel/2011-March/035302.html
http://wiki.koha-community.org/wiki/Namespace_QA_Rules
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Paul Poulain [Fri, 27 Jan 2012 12:58:50 +0000 (13:58 +0100)]
Merge remote-tracking branch 'origin/new/bug_6836'
Paul Poulain [Fri, 27 Jan 2012 12:58:20 +0000 (13:58 +0100)]
Bug 6836 follow-up fixing POD
this should please jenkins
Paul Poulain [Fri, 27 Jan 2012 11:38:00 +0000 (12:38 +0100)]
Merge remote-tracking branch 'origin/new/bug_7367'
Marcel de Rooy [Mon, 23 Jan 2012 13:18:50 +0000 (14:18 +0100)]
7367 Removing reintroduced debugging statement from Auth.pm
Commit
07d1eae7ccf5c8746251b666b6460440ecc26204 removed this statement from the module, but some months later commit
7b12e07d3ba44530d7ba33d09de01afef46bbfc7 reintroduced it again while reindenting code ;)
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Paul Poulain [Fri, 27 Jan 2012 11:28:11 +0000 (12:28 +0100)]
Merge remote-tracking branch 'origin/new/bug_7439'
Marcel de Rooy [Wed, 18 Jan 2012 13:44:48 +0000 (14:44 +0100)]
7439 Mailmap for master
Adding mailmap for git shortlog to master. Already present in 3.6.X.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Fri, 27 Jan 2012 11:18:25 +0000 (12:18 +0100)]
Bug 7157 follow-up: j2a.pl executable again
This patch just update the permission of the script, that must be executable
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Fri, 27 Jan 2012 11:18:25 +0000 (12:18 +0100)]
Bug 7157 follow-up: j2a.pl executable again
This patch just update the permission of the script, that must be executable
Liz Rea [Fri, 4 Nov 2011 18:20:23 +0000 (13:20 -0500)]
Bug 7157 - Improve the j2a.pl cronjob
- Calculates updates date based on the upper age limit defined in the patron categories.
- Allows libraries to work on all branches or only one.
- Allows libraries to specify which Adult patron category to update child categories to.
- Allows libraries to specify a single Child patron category to update to an adult category.
- Has a test mode to display what transforms would be done on the database without executing the changes.
Includes improved help, copyright statement, and uses warnings. Also incorporates Paul's suggestions regarding --help and --man, changes -fromcat and -tocat to -f and -t, and removes a redundant update to categorycode (per M. deRooy).
To test:
Create two patron categories, a child and an adult category. Make sure they
have an upper age limit.
Create or modify some patrons in multiple branches that fall into the category
of "my birthdate is less than or equal to today's date minus the upper age
limit"
1. Run the script with no flags - nothing should happen, it will suggest you try the --help flag.
2. Run the script with the --help flag - you should see the help
3. Run the script with the -f=<child category> -t=<adult category> -v -n - should show you results from all branches but take no action and tell you what its computations are.
4. Run the script with the -f=<child category> -t=<adult category> -b=<branchcode> -v -n - should show you results from your specified branch, but take no action and tell you what it's computations are.
5. Run the script with the -f=<child category> -t=<adult category> -v -b=<branchcode> - should show you the computations and tell you how many patrons were modified in your single branch. It will not show you the information on which patrons were updated.
6. Run the script with the -f=<child category> -t=<adult category> -v - should show you the computations and tell you how many patrons were modified across all branches.
7. Run the script without the -v flag, if you care what the non-verbose output looks like.
Fixed in this revision: Known limitation - if you give it an unknown tocat, it will fail with a rather ugly error.
Minor changes to the commit message to reflect new longopts (which I missed the last time)
There is more this script could do, please feel free to take it and run.
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Bug 7157 : Follow up, fixing FSF address
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Colin Campbell [Wed, 6 Jul 2011 07:24:28 +0000 (08:24 +0100)]
Bug 6752: Be stricter with utf-8 encoding of output
use encoding(UTF-8) rather than utf-8 for stricter
encoding
Marking output as ':utf8' only flags the data as utf8
using :encoding(UTF-8) also checks it as valid utf-8
see binmode in perlfunc for more details
In accordance with the robustness principle input
filehandles have not been changed as code may make
the undocumented assumption that invalid utf-8 is present
in the imput
Fixes errors reported by t/00-testcritic.t
Where feasable some filehandles have been made lexical rather than
reusing global filehandle vars
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Fri, 27 Jan 2012 10:58:58 +0000 (11:58 +0100)]
Merge remote-tracking branch 'origin/new/bug_6836'
Paul Poulain [Fri, 27 Jan 2012 10:56:41 +0000 (11:56 +0100)]
Bug 1633, follow-up, french string
Jared Camins-Esakov [Tue, 24 Jan 2012 13:41:01 +0000 (08:41 -0500)]
Bug 1633 follow-up: Fix jenkins tests
The previous patches missed adding the upload_local_cover_images permission to
languages other than en, and used a forbidden TT construct, giving jenkins
agitas and indigestion. This patch adds the permission to other languages and
corrects the syntax.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Fri, 13 Jan 2012 04:16:51 +0000 (17:16 +1300)]
Bug 6836: Adding dependency on Modern::Perl
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Chris Cormack [Fri, 13 Jan 2012 04:08:24 +0000 (17:08 +1300)]
Updating perlcriticrc to allow Modern::Perl to suffice instead of use warnings; and use strict;
http://bugs.koha-community.org/show_bug.cgi?id=6836
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Julian Maurice [Fri, 2 Dec 2011 09:27:11 +0000 (10:27 +0100)]
Bug 6836: test case readingrec.pl
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I tested the functionality and tested translation.
All important strings are in the template and can be translated.
Good work!
Owen Leonard [Fri, 2 Dec 2011 09:25:50 +0000 (10:25 +0100)]
Bug 6836: followup CSS work
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Julian Maurice [Fri, 8 Jul 2011 12:29:19 +0000 (14:29 +0200)]
Bug 6836: Add jQuery dataTables plugin
This patch add the javascript library, a CSS (and image files from
datatables.net) and another javascript file which provides some extra
features.
It also add a Perl module C4::Utils::Datatables which provides helpful
functions for server-side processing
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Paul Poulain [Tue, 24 Jan 2012 11:00:37 +0000 (12:00 +0100)]
Bug 1633 localcoverimages, updatedatabase & kohaversion for pushing
Jared Camins-Esakov [Wed, 18 Jan 2012 19:47:40 +0000 (14:47 -0500)]
Bug 1633: QA follow-up
* Show the "Upload images" button when OPACLocalCoverImages is enabled but
LocalCoverImages (i.e. local cover images on the staff client) is not
* Correct copyright and license comments in new files
* perltidy and replace tabs by four spaces
Signed-off-by: Koustubha Kale <kmkale@anantcorp.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Owen Leonard [Tue, 13 Dec 2011 19:19:29 +0000 (14:19 -0500)]
Bug 1633 - Interface revisions for the staff client
This patch revises the image viewer page to match other
biblio detail pages: a toolbar, a sidebar menu, etc.
Additional data is now pulled by imageviewer.pl in order
to provide information necessary for the proper functioning
of the toolbar and menus: item counts, hold availability,
biblio view options.
Other changes have been made to match the changes in the
OPAC interface like styling of the images and no-javascript
compatibility
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Patch failed to apply because of multiple Content-Type lines in the patch.
Corrected the same with this new patch.
http://bugs.koha-community.org/show_bug.cgi?id=6473
Jared Camins-Esakov [Wed, 14 Dec 2011 02:02:03 +0000 (21:02 -0500)]
Bug 1633: [SIGNED-OFF] Don't show image tab when inappropriate
This patch corrects the bug spotted by Owen Leonard where the Images tab was
showing up even for records that didn't have local cover images attached to
them. The tab is now hidden on the OPAC for records that don't have any
images. In the Intranet, an Images tab will show for staff with permission
to upload images, suggesting that they do so. For staff without that
permission, the tab is not shown.
This permission also disables returning images via the opac-image.pl and
catalogue/image.pl scripts when local cover images have been disabled.
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Koustubha Kale <kmkale@anantcorp.com>
Owen Leonard [Tue, 13 Dec 2011 17:22:09 +0000 (12:22 -0500)]
Bug 1633 - [SIGNED-OFF] Add ability to take book cover images from local img db
OPAC Template revisions:
- Revised OPAC imageviewer template to match structure of
other OPAC pages (with masthead search, footer, etc)
- Added link back to detail page (controlled by
BiblioDefaultView preference)
- Added link style to thumbnails on opac-detail to add a sense of
"clickability" to them
- Revised OPAC imageviewer template to allow it to function
with JavaScript turned off. Now even without JS main image
will load, thumbnails will be properly styled, and thumbnail
links will work.
- Changes to the script are only to pass missing variables
to the template
TODO: Corresponding changes for the staff client
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Koustubha Kale <kmkale@anantcorp.com>
Koustubha Kale [Tue, 13 Dec 2011 13:24:23 +0000 (08:24 -0500)]
Bug 1633: [SIGNED-OFF] Display local cover images
This patch adds display of local cover images in the following places:
1. OPAC Results page
2. OPAC Details page
3. Separate image viewer page for the OPAC
4. Intranet Details page
5. Separate image viewer page for the Intranet
Display in the Details and (OPAC) Results pages is handled via Javascript
rather than via direct embedding, to better handle the situation where most
records have local cover images, but a few do not.
Local cover images do not currently display in the Intranet Results page
How to use/test :
Assign user permission to the user Tools > (upload_local_cover_images Upload
local cover images). In order to upload local images, login to the staff
client. Go to Home > Tools > Upload Cover Images. Here you can upload cover
images either singly or in bulk in the form of a zip file. If uploading
singly, click on image file, browse the image from your local disk, type in
the biblio number of the catalogue entry and press upload. If uploading in
bulk as a zip file, the zip file must contain (in addition to cover images)
one text file named either datalink.txt OR idlink.txt. This file should
have mapping of biblionumber to image file name in the zip one per line
with comma or tab as delimiters. For example:
1, scanned_cover_image_of_bib_no_1.jpg
2, scanned_cover_image_of_bib_no_1.jpg
Cover images will be resized to a large image of 800x600 and a thumbnail of
200x140. Depending on the setting of AllowMultipleCovers, it is possible to
upload multiple images for a single bibliographic record. However, even if
multiple covers are permitted, you have the option of replacing the existing
covers by checking the "Replace existing covers" option on the upload screen.
1. The patch adds a menu link in Tools from where you can upload local cover
images
2. It adds a user permission to enable access control to this menu item under
Tools
3. It adds a system preference OPACLocalCoverImages under Enhanced Content.
This needs to be turned on to show local cover images in OPAC.
Once you have uploaded local images, if you search for the biblio, the local
cover should show up in search as well as search detail pages in the OPAC, and
the details view in the Intranet.
Koustubha Kale is working on another patch which will allow us to set a cover
image source priority in system preferences, and which will then gracefully
fail over to the next source if image is not available from the first choice
source.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Koustubha Kale <kmkale@anantcorp.com>
Rebased the patch because it was failing with koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css due to changes pushed in master.
Applies cleanly now.
Jared Camins-Esakov [Tue, 13 Dec 2011 13:20:41 +0000 (08:20 -0500)]
Bug 1633: [SIGNED-OFF] Add support for uploading images to Koha
A frequently-requested feature for Koha, especially by special libraries, is
the ability to upload local cover images into Koha.
This patch adds a bibliocoverimage table, and image handling code in the
C4::Images module. Key features of the implementation include:
1. The ability to have multiple cover images for a biblio
2. Handling for "full size" (800x600) and thumbnail-size (200x140) images
3. Uploading images directly from the record view
The image display functionality by Koustubha Kale of Anant Corporation will
follow in a second patch.
Special thanks to Koustubha Kale and Anant Corporation for the initial
implementation of local cover images, and to Chris Nighswonger of Foundation
Bible College for his prior work on patron images.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Will add comments on Bugzilla.
Patch failed to apply because installer/data/mysql/sysprefs.sql had changed in master.
Corrected the same with this new patch.
Paul Poulain [Tue, 24 Jan 2012 10:02:08 +0000 (11:02 +0100)]
history.txt removing a useless tab
Liz Rea [Tue, 17 Jan 2012 21:30:31 +0000 (15:30 -0600)]
Bug 6350 - Adding new developers to history.txt Jesse Maseto Connor Dewar Sam Sanders
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Alex Arnaud [Fri, 20 Jan 2012 09:02:16 +0000 (10:02 +0100)]
bug 7343 - Fix empty values in statistic 1 and 2 dropboxes in neworderempty
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tested. Comments have been incorporated. Marked as Passed QA.
http://bugs.koha-community.org/show_bug.cgi?id=7342
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Garry Collum [Fri, 20 Jan 2012 17:24:27 +0000 (12:24 -0500)]
Bug 7098: Adds koha_url elements to sco.css.
The 'Powered by Koha' link was not styled in self-cko. The koha_url elements were missing from sco.css. The elements within opac.css were copied and added to sco.css.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Marcel de Rooy [Thu, 5 Jan 2012 13:45:06 +0000 (14:45 +0100)]
6829 Follow up
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Needed this second follow up to remove 952-0 from the display again, coming up after the first follow up.
Changed a second test in accordance with first follow up.
Removed a useless 10th loop to create a tab10XX that is not in the template.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Frédéric Demians [Tue, 27 Dec 2011 10:01:48 +0000 (11:01 +0100)]
Bug 6829 Follow up patch
To reproduce the bug:
- Open OPAC MARC View for a specific biblio record
- Fields which are affected to tab 0 are all hidden
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Patch fixes bug for 0xx fields in OPAC MARC view.
Note: the problem only exists for 0xx fields with real subfields,
control fields display correctly, fields like 040 only display
after patch was applied.
Colin Campbell [Fri, 26 Aug 2011 15:17:11 +0000 (16:17 +0100)]
Bug 6790: Remove unnecessary variable from getroutinglist return
getroutinglist returns a count variable to indicate how many elements
are in the array. This is almost always a serious code smell. (We are
programming in a list manipulating language) The routine was executing
am unnecessary loop just to maintain that var.
Removed the variable from the routine and perldoc
refactored calls of the routine removed the c-style loops for
more idiomatic and maintainable for loops
renamed some opaquely named variables
removed a call to the routine where nothing was done with the data
moved some html out of the calling script and into the template
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Chris Cormack [Wed, 4 Jan 2012 19:54:43 +0000 (08:54 +1300)]
Bug 7402 : Fixing the date formatting so links to the invoice page work
This depends on bug 929
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Uses the new TT plugin to display the date, while using iso format
to build a correct URL to the invoice page.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Fri, 20 Jan 2012 15:30:48 +0000 (16:30 +0100)]
Bug 5473 follow-up : removed warn & replace some tabs by 4 spaces
Srdjan Jankovic [Tue, 20 Dec 2011 01:56:51 +0000 (14:56 +1300)]
bug_5473: Update items when receiving shipments
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Tested by recieving multiple items with the AcqCreateItem
preference set to 'placing and order' and 'receiving an item'
In both cases the pricing and vendor is brought over to the
item record so I'm signing off.
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Nicole C. Engard [Mon, 2 Jan 2012 13:40:55 +0000 (08:40 -0500)]
Update CircAutoPrintQuickSlip description
This patch simply removes the repeated string in the
description for this preference.
http://bugs.koha-community.org/show_bug.cgi?id=7429
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Julian Maurice [Wed, 10 Aug 2011 09:41:06 +0000 (11:41 +0200)]
Bug 6694: Problem with casAuthentication syspref
A missing test in checkauth caused anonymous session to be destroyed and
re-created at every call when this syspref was set.
Almost the same issue is also fixed in check_api_auth, which caused
C4::Service->init to fail.
Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Paul Poulain [Fri, 22 Jul 2011 08:24:26 +0000 (10:24 +0200)]
BZ6115: Acquisition reports : date filter & sorting don't work
* the filter on dates don't work
* when displaying by day or month, it was 100% alphabetic, april was before
january for example. Adding the month number before the month name to get
proper sorting
* removed many commented warn & lines
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Paul Poulain [Thu, 19 Jan 2012 15:48:54 +0000 (16:48 +0100)]
Koha version updated
Jonathan Druart [Tue, 17 Jan 2012 10:39:54 +0000 (11:39 +0100)]
Bug 5347: Followup change class for message + Unit test