Commit Graph

17309 Commits

Author SHA1 Message Date
Paul Poulain 5877be4d34 Merge remote-tracking branch 'origin/new/bug_8842' into 3.10.x 2012-11-05 16:58:03 +01:00
Paul Poulain d4233455a0 Merge remote-tracking branch 'origin/new/bug_8490' into 3.10.x 2012-11-05 16:57:34 +01:00
Paul Poulain 4e5922b387 Bug 8842 fix Plack scoping for holidays
the internal sub add_holiday uses some variables that are defined in the main script, usual fix

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-05 08:41:17 -05:00
Paul Poulain 7002e5d86a Bug 8490: fix Plack error when creating label layout
This patch fixes "Error message "Can't bless non-reference value at
/home/pi/koha/C4/Creators/Layout.pm line 111." when trying to add a
label layout while using plack."

The $layout_id variable is set to 5001 on my setup. And 5001 is the Unix
port where I run Plack. WTH is this value stored in this variable ?
Because of
> my $layout_id = $cgi->param('layout_id') || $cgi->param('element_id') || $ARGV[1] || '';
in label-edit-layout.pl

Removing $ARGV[1] solves the problem
Also removing $ARG[0] because I also don't think it's useful

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed off after confirming with Chris Nighswonger that these scripts
were not intended to be run from the command line. Works as promised.

Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-05 08:35:06 -05:00
Paul Poulain 7f382e3693 Merge remote-tracking branch 'origin/new/bug_8904' into 3.10.x 2012-11-05 09:51:46 +01:00
Paul Poulain b6b6329435 Bug 8904: fix Plack scoping for overduerules.pl
There are 2 Plack scoping errors in tools/overduerules.pl:
the local sub blank_row require that @rule_params and input are global

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>y
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-04 19:58:33 -05:00
Paul Poulain db1ae46b00 Merge remote-tracking branch 'origin/new/bug_8826' into 3.10.x 2012-11-02 17:42:58 +01:00
Paul Poulain b7257e62f2 Merge remote-tracking branch 'origin/new/bug_8945' into 3.10.x 2012-11-02 17:42:45 +01:00
Kyle M Hall 5011479de3 Bug 8826 - Initialization of hash triggers error log entries - Followup
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-02 12:11:52 -04:00
Mark Tompsett bf4a7bd65c Bug 8826 - Initialization of hash triggers error log entries.
Changed:
our %renew_failed = {};
To:
our %renew_failed = ();
This prevents an error log about Reference found where
even-sized list expected.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-02 12:11:51 -04:00
Jared Camins-Esakov 369c5382a4 Merge branch 'bug_8945' into 3.12-master 2012-11-02 12:00:32 -04:00
Nicole C. Engard be0f16aaac Bug 8945: Update Tags help files for 3.10
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-02 11:58:58 -04:00
Nicole C. Engard c075970daa Bug 8945: Tools Help Files
This patch updates the help files for 3.10 in the Tools
section and adds a help file for the patron modification tool

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed off patch includes one small fix:
Profilemarcfields -> Profile MARC fields
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-02 11:58:57 -04:00
Nicole C. Engard fbc7b11d5d Bug 8945: Update lists help for 3.10
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-02 11:58:56 -04:00
Nicole C. Engard e15ea30899 Bug 8945: Update suggestion help file for 3.10
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-02 11:58:55 -04:00
Nicole C. Engard 0d0d5c48bc Bug 8945: Serials Help Files for 3.10
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-02 11:58:54 -04:00
Paul Poulain 9d15697fe8 Merge remote-tracking branch 'origin/new/bug_8804' into 3.10.x
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-11-01 22:48:28 +01:00
Paul Poulain 235ee021c4 Merge remote-tracking branch 'origin/new/bug_7455' into 3.10.x
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-11-01 22:41:59 +01:00
Paul Poulain ddd3004c3c Merge remote-tracking branch 'origin/new/bug_8931' into 3.10.x
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-11-01 22:36:29 +01:00
Paul Poulain beb71dc306 Merge remote-tracking branch 'origin/new/bug_8636' into 3.10.x
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-11-01 22:35:15 +01:00
Paul Poulain be021c627d Merge remote-tracking branch 'origin/new/bug_8846' into 3.10.x
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-11-01 22:32:17 +01:00
Owen Leonard 5b8e1548e4 Bug 8804 [Revised] Quiet errors in the log from Auth.pm
Found three cases where variables were being
referenced which did not (in each case) exist. Adding
checks for those variables' existence.

Errors appeared when logged in and viewing a detail
page in the OPAC.

Revision simplifies logic as per RM suggestion.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-01 16:57:19 -04:00
Paul Poulain ba587ff1cd Merge remote-tracking branch 'origin/new/bug_8978' into 3.10.x 2012-11-01 20:32:19 +01:00
Paul Poulain bfbc0c840f Merge remote-tracking branch 'origin/new/bug_8982' into 3.10.x 2012-11-01 20:30:02 +01:00
Paul Poulain 084034388a Merge remote-tracking branch 'origin/new/bug_8707' into 3.10.x 2012-11-01 20:26:14 +01:00
Jared Camins-Esakov b81be8cc48 Correct a typo in docs/history.txt and add 3.6.x releases
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-11-01 20:11:50 +01:00
Jared Camins-Esakov 4db3611ee6 Merge branch 'bug_7455' into 3.12-master 2012-11-01 10:31:14 -04:00
Fridolyn SOMERS 9b55ebff65 Bug 7455: Authority subfields are cloned in the wrong field (follow-up 3)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-01 09:50:56 -04:00
Fridolyn SOMERS 7cf5e2e954 Bug 7455: Authority subfields are cloned in the wrong field (follow-up 2)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-01 09:50:53 -04:00
Fridolyn SOMERS eabe698705 Bug 7455: Authority subfields are cloned in the wrong field (follow-up)
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-01 09:50:50 -04:00
Fridolyn SOMERS 2f860e36f6 Bug 7455: Authority subfields are cloned in the wrong field
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-01 09:50:32 -04:00
Jared Camins-Esakov 9bcc1f9095 Merge branch 'bug_8931' into 3.12-master 2012-11-01 09:32:53 -04:00
Owen Leonard 1ce2386e36 Bug 8931 - submit buttons have blue background
This patch specifies a transparent background for fieldsets
and divs with the class "action," which are typically containers
for the submit/cancel actions.

For testers, a good example page to view is the "set library" page.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-01 09:32:15 -04:00
Robin Sheat ba8be1f2f9 Bug 8636 - add Moose dependency to the dependencies
Koha::SearchEngine requires moose, but it wasn't declared as a
dependency.

Also update the debian/control dependencies to match the current state
of the requirements.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Passed-QA-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-01 09:25:15 -04:00
Jared Camins-Esakov f352b05610 Bug 8846 conflict resolution: correct path
The test was moved since the original patch was written, making the
revised test fail. This patch corrects the mocked template patch so that
the test will pass.

To test:
1) Before applying patch, run
   `prove t/db_dependent/SuggestionEngine_ExplodedTerms.t`
2) Note that it fails.
3) Apply patch.
4) Run `prove t/db_dependent/SuggestionEngine_ExplodedTerms.t`
5) Note that it passes.
6) Celebrate.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2012-11-01 08:41:30 -04:00
Jared Camins-Esakov e2a702653d Bug 8846: Exploded Terms test sneakily uses database
Even though there is no need for anything stored in the database for the
test, C4::Templates requires the database and a koha-conf.xml. The
solution is to mock all database- and koha-conf-using routines.

To test:
1) Stop MySQL
2) Unset KOHA_CONF
3) Run test

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-11-01 08:41:29 -04:00
Lyon3 Team 43ba461f39 Bug 8978: Patron's dateexpiry erroneously updated when in UnwantedField
If dateexpiry field was absent because it has been included in
UnWantedField syspref list, the script assumed that the date has
been forgotten and updated it when clicking on 'save' button.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-10-31 18:33:44 -04:00
Jared Camins-Esakov ea9e867a59 Merge branch 'bug_8982' into 3.12-master 2012-10-31 17:22:35 -04:00
MJ Ray 80c75dcc8f Bug 8982 make koha-create accept --database option
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-10-31 17:20:22 -04:00
Owen Leonard f191782d98 Bug 8707 - tags always say approved
Template scope error caused an incorrect state on the
approval/rejection buttons when viewing rejected tags.

To test, go to Tags and view the list of rejected tags.
In the "Actions" column, the "rejected" button should be
greyed out, and the "approve" button active.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Passed-QA-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-10-31 16:48:24 -04:00
Jared Camins-Esakov 5994dd21f7 Correct a typo in docs/history.txt and add 3.6.x releases 2012-10-31 15:10:02 -04:00
Owen Leonard 715c52977a Bug 8980 - Untranslatable strings in modborrowers.pl
This patch removes the declaration of interface labels
from the script and puts it in the template where the
labels can be translated. The labels have been modified
to match those used on the patron entry form.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-30 18:28:35 +01:00
Fridolyn SOMERS 678c7c4230 Bug 8936: Search RSS feeds does not show there items when subscribing in Firefox
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-30 18:24:54 +01:00
Fridolyn SOMERS d12f4e09ee Bug 8973: HTML and URL escape missing in OPAC templates
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-30 18:15:22 +01:00
Jared Camins-Esakov 510a2397fb Bug 8665 follow-up: add missing line to XSLT
The DOM transformer was missing a line from a previous development,
resulting in the MARC21 authorities DOM indexing stylesheet being
regenerated with a missing line. This patch readds the missing line
to the transformer, and provides the corrected authority-zebra-indexdefs.

Signed-off-by: Elliott Davis <elliott@bywatersolutions.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-29 19:12:41 +01:00
Jared Camins-Esakov 7d9b4d58e3 Bug 8665: DOM indexing fails to index some bib records
Use a user-specified field for z:id.

This patch also fixes an excess space before the index in the MARC21
biblio index definitions, which someone fixed in the generated file
but not in the source file it should have been fixed in.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Elliott Davis <elliott@bywatersolutions.com>
2012-10-29 19:12:38 +01:00
Maxime Pelletier 5c7fae8e89 Bug 8966 Koha::Calendar::is_holiday truncates the date
* Create a local copy of the date instead of calling truncate directly on the date
* Add a test to properly test that the issue is fixed

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-29 18:27:04 +01:00
Mark Tompsett f47dceb151 Bug 8749 - Missing Ubuntu library files in ubuntu.*.packages
Added:
   libtemplate-plugin-htmltotext-perl	install
into the four files, as this is available in the
debian.koha-community.org repository.

Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-29 18:17:58 +01:00
Nicole C. Engard b141a35692 Bug 8961: Fix typo in offline circ help
Signed-off-by: Marc Veron <veron@veron.ch>

Tiny typo fix in HTML text.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-29 12:36:21 +01:00
Magnus Enger 000605e939 Bug 8941 - Make title display properly for NORMARC OPAC detail view
Authors and materialtype were displayed to the right of the title.
This patch simly adds class="title" to the h1 that holds the title.

To test:
- Set marcflavour = NORMARC
- Check a detail view in the OPAC and see that the display is wrong
- Apply the patch
- Check that the detail view now looks good

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-10-28 19:39:44 +01:00