Commit graph

18930 commits

Author SHA1 Message Date
Jared Camins-Esakov
9f0e21c6b7 Merge branch 'bug_10152' into 3.14-master 2013-05-01 06:25:58 -04:00
Jared Camins-Esakov
23b9661efa Bug 10152: Default sorting wrong in parcels.pl
When you are receiving an order, the list of existing invoices should
appear in reverse chronological order. Unfortunately, right now it
appears in regular chronological order.

To test:
1) Make sure you have multiple invoices that have varying shipment
   dates for a vendor. We will assume this vendor is called "Example
   Vendor."
2) Choose the "Receive shipments" button on the Example Vendor page.
3) Note that the invoices are sorted by regular chronological order.
4) Apply patch.
5) Refresh "Receive shipment" page. Note that invoices are now sorted
   in reverse chronological order.
6) Sign off.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 06:25:55 -04:00
Jared Camins-Esakov
8f37d71906 Merge branch 'bug_10153' into 3.14-master 2013-05-01 06:23:46 -04:00
065fe316ea Bug 10153 - Patron header search form is too wide
The patron header search form is now too wide to display correctly on
screens smaller than about 1110px. This patch groups the
previously shown-by-default choices with the hidden additional
search parameters.

To test, apply the patch and view any page which includes the patron
header search include, for example members/members-home.pl. Additional
search options should be hidden by default. Clicking "[+]" should show
all additional options: Search fields, search type, order by, library,
and category.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Works for me.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script. I like this change.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 06:23:43 -04:00
Jared Camins-Esakov
965d2bb788 Merge branch 'bug_8264' into 3.14-master 2013-05-01 06:21:40 -04:00
Jared Camins-Esakov
898e8f131c Add Edmund Balnaves to history
Welcome, Edmund. You are the 210th committer to Koha!
2013-05-01 06:20:00 -04:00
Edmund Balnaves
7e293e20de Bug 8264 - local cover images not working in IE8 [ prog ]
[Patch submitted by David Cook]
Edmund, rather than myself, was the author of this patch,
so I'm not entirely sure about his code choices, but...it
looks like IE must process images differently than other
browsers.

It seems to me that the images are not appearing in IE,
because they're being regarded as incomplete or having
0/NULL natural width.

This patch simply introduces a try/catch hack where it
tries to add the image and remove any "no-image" elements
even nwhen the image is considered incomplete/width of
0/NULL. It won't do this if it catches any errors,
although I'm not sure that any errors would be caught
with this set up anyway...

It's certainly not the ideal solution, but it's a solution.

To Test:

Before applying the patch:
1) Use IE and FF/Chrome/other browser to view a record
   with local images attached
2) Note that the local images appear in FF/Chrome/other,
   but not in IE

Apply patch.

After applying the patch:
1) Repeat step 1 from above
2) Note that the local images now appear in all browsers
   as they should.

--

As I mentioned before, this seems like a real suboptimal
solution. Any ideas on why IE might be considering local
images to be incomplete or having 0/NULL natural width?

Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I did a regression test using Chromium and Firefox in
Ubuntu. I checked both prog and CCSR - covers displayed
nicely.
All tests and QA script pass.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Changed author of patch to reflect actual authorship.
2013-05-01 06:16:38 -04:00
Galen Charlton
16753c750d Revert "Bug 6554 Followup for circulation patron search"
This reverts commit f257944d10.

Rolling back bug 6554 work until we have more comprehensive tests.
2013-04-29 15:17:39 -07:00
Galen Charlton
5e47f766a2 Revert "Bug 6554: Followup for preferences.pl"
This reverts commit c78b905811.

Rolling back bug 6554 work until we have more comprehensive tests.
2013-04-29 15:17:31 -07:00
Galen Charlton
7459297a3a Revert "Bug 6554: Followup for acquisitions"
This reverts commit b2b003adea.

Rolling back bug 6554 work until we have more comprehensive tests.
2013-04-29 15:17:24 -07:00
Galen Charlton
7c6e4f5a8d Revert "Bug 6554: Followup for serial search"
This reverts commit c18cd930eb.

Rolling back bug 6554 work until we have more comprehensive tests.
2013-04-29 15:17:18 -07:00
Galen Charlton
94508a5c3d Revert "Bug 6554 QA Followup"
This reverts commit 686fdae32c.

Rolling back bug 6554 work until we have more comprehensive tests.
2013-04-29 15:17:06 -07:00
Galen Charlton
a7eb34f2c8 Revert "Bug 6554 - make Koha internally utf-8 clean"
This reverts commit d542740ab8.

Rolling back bug 6554 work until we have more comprehensive tests.

Conflicts:

	opac/opac-search.pl
2013-04-29 15:12:32 -07:00
Galen Charlton
4ba31d2e28 Revert "Bug 6554 Fix error caused by modifying $_ in a map"
This reverts commit e98fe7e322.

Rolling back bug 6554 work until we have more comprehensive tests.
2013-04-29 15:10:45 -07:00
Galen Charlton
3536b10acf Revert "Bug 10074 - Encoding problems at login time"
This reverts commit 5805b5f363.

Rolling back bug 6554 work until we have more comprehensive tests.
2013-04-29 15:10:23 -07:00
Galen Charlton
abe349ed6c Revert "Bug 10074 - Encoding problems for installer"
This reverts commit d0c6e09429.

Rolling back bug 6554 work until we have more comprehensive tests.
2013-04-29 15:09:48 -07:00
Galen Charlton
ad5e44bcde Revert "Bug 10074: QA Followup for InstallAuth.pm"
This reverts commit e848d89e45.

Rolling back bug 6554 work until we have more comprehensive tests.
2013-04-29 15:06:12 -07:00
Galen Charlton
327b6c6ce3 Revert "Bug 10019: Fix for userid containing UTF8 chars"
This reverts commit 7e90e1524f.

Rolling back bug 6554 work until we have more comprehensive tests.
2013-04-29 15:05:22 -07:00
Galen Charlton
11b62318f4 Revert "Bug 9951: Followup for Tools"
This reverts commit 252568aa8b.

Rolling back bug 6554 work until we have more comprehensive tests.
2013-04-29 15:04:38 -07:00
Galen Charlton
5948badf43 Revert "Bug 9951: Followup for tools/viewlog.pl"
This reverts commit de7ba790fd.

Rolling back bug 6554 work until we have more comprehensive tests.
2013-04-29 15:03:45 -07:00
Jared Camins-Esakov
9c79f18317 Merge branch 'bug_10088' into 3.14-master 2013-04-27 08:23:34 -04:00
Jonathan Druart
f2e44716f6 Bug 10088: FIX adding an order from a staged file.
Bug 9902 introduced an issue in the C4::Items::PrepareItemrecordDisplay
routine. The existence of $defaulvalue hashref should be tested before
getting to the branchcode key.

Test plan:
Before applying the patch, an error occurred when you try to create an
order from a staged file.
After applying the patch, the error does not appear anymore.

Signed-off-by: Mathieu Saby <mathieu.saby@univ-rennes2.fr>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-27 08:23:31 -04:00
Jared Camins-Esakov
5c529f2339 Merge branch 'bug_2046' into 3.14-master 2013-04-27 08:12:18 -04:00
Jared Camins-Esakov
e1ecd7aa3f Bug 2046: Increment version number
Database update for bug 2046 has been given version 3.11.00.203
2013-04-27 08:11:39 -04:00
Kristina D.C. Hoeppner
7a5dc6eef5 Bug 2046 - Suggestions: Title Field too small
Increase both on staff and OPAC interface
from 80 to 255 characters to be saved in
the database. Shown will be 80 characters.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Clean patch, workes as described.

To test:
- Apply patch and run database update
- Check that the column in the database is now varchar(255)
- Enter a new suggestion in the OPAC
- Edit this suggestion in staff
- Confirm form has the new max value set
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-27 08:11:36 -04:00
Jared Camins-Esakov
eae18676cc Merge branch 'bug_10093' into 3.14-master 2013-04-27 07:21:50 -04:00
Jared Camins-Esakov
97596d9498 Add Stefano Bargioni to the history
Welcome, Stefano, you are the 209th developer with a patch in Koha!

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-27 07:21:25 -04:00
Stefano Bargioni
9a449ce16c Bug 10093 - Typo in marc21_leader.tt
fixed a typo in marc 21 leader builder about the value 'b', Serial component part

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Good catch.
Template change only.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-27 07:20:45 -04:00
Jared Camins-Esakov
df4b443597 Merge branch 'bug_10110' into 3.14-master 2013-04-27 07:15:38 -04:00
8084a70a3b Bug 10110 Followup for Acquisition.pm
Adding a FIXE at a line that uses $sth->{NAME} for possible utf8 problems.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Adds a comment, no danger from that.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-27 07:15:35 -04:00
d050e557f4 Bug 10110: Problems with diacritics in saved SQL reports
Adds decoding for cgi params (for completeness).
Apparently, the NAME attribute of DBI statement handle has a UTF8 bug.
Fixing this by decoding the returned column names.
Did this in a shared routine.

http://bugs.koha-community.org/show_bug.cgi?id=10110
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

Copying test plan from bug report:

Example SQL:
select
branchname as "Bibliothek (üöä)",
branchname "Bibiothek (üäa)",
branchname
from branches where branchcode = <<Bibliothekskürzel|branches>>

1) Create report with given example SQL or your own including
   some diacritics in the columnnames
2) Save the report and run it
3) Verify column names are broken before patch, but fixed after..

All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-27 07:15:35 -04:00
Jared Camins-Esakov
3d589018e7 Merge branch 'bug_9684' into 3.14-master 2013-04-27 07:08:15 -04:00
Colin Campbell
5b6f89714d Bug 9684 : Correct path to compact.xsl
When try to display card view of retrieved record
error occurred as compact.xsl could not be found
script was constructing path as though it was opac

Also added fallback to en version if no xsl file
found under current lang as done in opac-showmarc.pl

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Test plan:

* Set sys pref to use CCSR
* Do a Z39.50 Search
* Click 'card' on one of the results
* confirm that there is no error.

All test pass

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I am astonished that opacthemes affects Z39.50 search in
staff so this might be fixing a bigger problem.

Checked that clicking on Card works for both themes now
correctly after I confirmed the bug.
Also all views in OPAC were checked for both themes.

All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-27 07:08:13 -04:00
Jared Camins-Esakov
906bf789fe Bug 9659 follow-up: correct syntax for older Perl
A construction that was a syntax error in older versions of Perl was
causing problems for jenkins. This patch fixes it.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-26 21:32:49 -04:00
Jared Camins-Esakov
9fbdc7b1d6 Merge branch 'bug_9886' into 3.14-master 2013-04-26 18:37:35 -04:00
4b1c71e91a Bug 9886: ParseLetter removes too often punctuation characters from fields
This patch makes ParseLetter somewhat more restrictive in removing
punctuation characters from the end of a table field.
Based on the assumption that we want to remove punctuation from fields in
biblio and biblioitems (like ISBD).
ParseLetter should not remove e.g. a parenthesis in itemcallnumber, but still
removes e.g. a colon (:) at the end of a title.
Removed an unneeded global and lookahead from the regex.

Test plan:
1) Add a colon (:) to the end of a title.
2) Add a colon to the end of item copynumber.
3) Place a hold on that item. Check it in. Confirm hold.
4) Check the email or print notice generated. There should be no colon at the
end of the title, but the colon in the copynumber should still be there.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I compared checkout notices with lots of different fields before
and after applying the patch. For example the ) at the end of a
field in branches is now longer removed. Other fields looked ok
before and after.
Passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-26 18:37:32 -04:00
Jared Camins-Esakov
12fd63da99 Merge branch 'bug_9671' into 3.14-master 2013-04-26 18:35:56 -04:00
Aaron Wells
109f316efb Bug 9671: Make fines.pl help text more accurate
To test:

run kohaclone/misc/cronjobs/fines.pl --help and note the help text. It should match the settings in System Preferences.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Documentation change, passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-26 18:35:40 -04:00
Jared Camins-Esakov
86f3175a0d Merge branch 'bug_10040' into 3.14-master 2013-04-26 18:33:03 -04:00
Katrin Fischer
0f2945d768 Bug 10040: Capitalization wrong when deleting subfields from authority
Confirmation message for deleting subfields from an authority framework
has wrong capitalization.

To reproduce:
1) Go to Administration > Authority types
2) Click on MARC structure for one of the authority types
3) Click on the subfields link for one of the fields
4) Delete one of the subfields

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Passed-QA-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-26 18:32:59 -04:00
Jared Camins-Esakov
ff15670008 Merge branch 'bug_10073' into 3.14-master 2013-04-26 18:31:13 -04:00
ab5c3eccf4 Bug 10073: Show ccode or location also if not bound to Authorized Values in XSLT
If you do not have ccode or location governed by authorized value
(you can release this default connection in the marc structure),
these item values are not passed through in the items section,
created by buildKohaItemsNamespace for XSLTParse4Display.

This simple patch checks if the authorized value hash on ccode or
location returns something and passes the original value in otherwise.

Test plan:
Temporarily disconnect ccode and location from authorized values
in MARC structure.
Edit an item, put some values in location and ccode.
Look at this record via opac search (XSLT enabled). Toggle the value of
OPACItemLocation to show ccode or location before call number.
Restore authorized values-connection when applicable.

Note: Since bug 9995 adjusts OPAC XSLT Results, it may be helpful
to apply these
patches when testing this.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
This works as described for the XSLT result list.
The text is shown when OpacItemLocation is set to show collection
or location.

Note: Displaying location and collection without using authorised
values doesn't work in other places like the detail page item table.
So this will need more work to be fully functional.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-26 18:31:01 -04:00
Jared Camins-Esakov
9f8a7baa50 Merge branch 'bug_10103' into 3.14-master 2013-04-26 18:17:09 -04:00
Mirko Tietgen
faa93aff62 Bug 10103 UniqueItemFields is missing from sysprefs.sql
Bug 7892 introduced UniqueItemFields but did not add it to sysprefs.sql.
Also fixes an unrelated  missing semicolon in sysprefs.sql

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>
2013-04-26 18:17:05 -04:00
Jared Camins-Esakov
03b4dfe846 Merge branch 'bug_9219' into 3.14-master 2013-04-26 08:18:59 -04:00
6385cfd1dc Bug 9219 - Show damaged and lost statuses for issues on circulation.pl as they are on moremember.pl
This patch adds the lost and damaged status for an issued item to the
table of issued items on circulation.pl to make it align more closely to
the same table on moremember.pl

Test Plan:
1) Apply patch
2) Issue an item
3) Set the item's damaged status
4) Verify the status is showing near the date due on circulation.pl
5) Clear the damaged status and set the lost status again
6) Repeat step 4

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

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
I could only test this with the DAMAGED value, because
currently lost items are removed from the patron account
when you set the status.
I know there is a patch somewhere
to make it optional and the change looks alright.
Passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-26 08:18:52 -04:00
Jared Camins-Esakov
48161f3c8a Merge branch 'bug_9659' into 3.14-master 2013-04-26 08:09:23 -04:00
Jared Camins-Esakov
1f9145bbbd Bug 9659: Move new unit test to db-dependent directory
C4::Reports::Guided requires a koha-conf.xml file to be in place in
order to load. This means that any test which uses it has to go in
t/db_dependent

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-26 08:08:07 -04:00
6110375307 Bug 9659 - QA Follow up: Unit tests
Added some tests against the methods added by this patch.

To test, prove -v
- t/Koha.t
- t/ReportsGuided.t

Edit: fixed the amount of tests in the skip block. Tests fail for people having earlier versions of DBD::Mock.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works quite nicely!
All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-26 08:07:24 -04:00
cdc5e11159 Bug 9659 - Better handling of non-existent authorised value categories used in SQL reports
A user might create a SQL report that relies on non-existent authorised value categories.
Because of a typo, or just because they copy&pasted the report from the Wiki.

Use cases are:

- The user creates a report from SQL
  a) Uses bad authorised values
  b) Clicks 'Save Report'
  c) Koha lists the problematic authorised values
  d) The user decides to
  e-1) Save it anyway, it gets saved
  e-2) Edit the report, it gets back to where it chose 'Save Report'

- The user edits an already saved report (Update SQL)
  a) Uses bad authorised values
  b) Clicks 'Update SQL'
  c) Koha lists the problematic authorised values
  d) The user decides to
  e-1) Save it anyway, it gets saved
  e-2) Edit the report, it gets back to where it chose 'Update SQL'

- The user tries to run a saved report that contains bad authorised values, Koha advertises the problem and provides the user with a button 'Edit SQL' to fix things.

To test, just create a report from SQL using invalid authorised values like this (misspelled 'branch'):

SELECT *
FROM itemtypes
WHERE hola=<<Test branch1|branchee>> AND
      hola2=<<Test branch2|brancha>>

Regards
To+

Notes:
- I added several comments on the code.
- Fixed an annoying warning of uninitialised variable also (refactored some tiny bits to do it).
- Added the following methods
   -  C4::Reports::Guided::GetReservedAuthorisedValues
   -  C4::Reports::Guided::GetParametersFromSQL
   -  C4::Reports::Guided::IsAuthorisedValueValid
   -  C4::Reports::Guided::ValidateSQLParameters
   -  C4::Koha::IsAuthorisedValueCategory
- Those methods could have been used to refactor this guided reports code as its *a bit messy*. I chose to do it in a new bug of course :-D.
- Fixed some trivial perlcritic -5 errors
- Removed some debugging stuff left by mistake
- Fixed some POD problems
- Optimal SQL-driven IsAuthorisedValueCategory method
- Thanks to Owen and Jared for their patience heh.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Comment: Work as described. No koha-qa errors.

Test:
Tried with examples (from help and test plan) reports, correctly
identifies invalid authorized values, and no problem with
authorized ones.

NOTE: Online help for this does not states that partial values
need to be between '%' in a SQLish way. Perhaps this could be
addressed inserting % in values or adding a checkbox (partial|exact).
Or changing help.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-04-26 08:07:24 -04:00