Commit graph

18026 commits

Author SHA1 Message Date
Chris Cormack
219ec8f898 Bug 9587 : Handling mismatched emails better
To test:

Sign in to Koha via persona using an email that doesn't exist in Koha

Before the patch you will get into an infinite redirect loop

After the patch it will give you an error message

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Comment: Work as described. No errors.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-24 10:15:56 -05:00
Katrin Fischer
d8d2572257 Bug 9587 : QA follow up - fix one tabulation character
Makes QA script happy.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-24 10:15:56 -05:00
d03c8443a4 Bug 9587 Follow up to fix the problem Katrin identified
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Comment: Solve that problem, but now koha-qa complains about tabs
in C4/Context.pm.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Tests done:
1) System preference 'Persona' added correctly.
2) Persona off, normal login still possible
3) Persona on, Persona login works
4) Persona logout works
5) normal login still possible
6) normal logout still possible

Persona is off by default and uses the primary email address
from the patron account.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-24 10:15:55 -05:00
8cb1ac85a2 Bug 9587 : Followup removing a commented out warn that was annoying the qa tools
Not introduced by this work but no reason not to clean it

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Comment: no more complains from koha-qa

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-24 10:15:55 -05:00
3e8f39015b Bug 9587 : Follow up, fixing tabs in C4/Auth.pm
And translation problem in masthead.inc

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-24 10:15:55 -05:00
493dcede48 Bug 9587 : Mozilla Persona login
Working on Mozilla Persona support (browser id)

    This will let a user log into Koha using browser id, if their email
    address used matches the email address inside Koha.

    Once an assertion is received, we simply need to find the user that
    matches that email address, and create a session for them.

    opac/svc/login handles this part.

    The nice thing about it is, the user doesn't have to do anything, like
    linking their account. As long as the email address they are using to
    identify themselves in browserid is the same as the one in Koha it
    will just work.

    This is covered by a systempreference, to allow people to do it, and
    is of course totally opt in, it works alongside normal Koha (or any
    other method) of login. So only those choosing to use it, need use it

Test Plan

1/ Make sure OPACBaseURL is set correctly
2/ Switch on the Persona syspref
3/ Make a borrower (or edit one) to have the email you plan to use as
the primary email
4/ Click sign in with email, make or use a persona account
5/ Logout
6/ Check you can still login and logout the normal way

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Comment: Works great.
It's not browser dependent, but tested with chrome, firefox, opera and safari.
Old an new login system works.
Minor errors, addresed in follow-up.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-24 10:15:35 -05:00
Jared Camins-Esakov
c644598a04 Merge branch 'bug_8682' into 3.12-master 2013-02-24 10:10:32 -05:00
Liz Rea
63412f0ecd Bug 8682 - Renewals do not appear on quick slips
To test:
Issue two books to a patron.
Do a renewal on one of them.
update the issuedate on the item that has been renewed to something before today (renewals on the same day will work even without this patch)
I did: select * from issues;
update issues set issuedate="2013-01-25 14:00:00" where itemnumber = 948; (itemnumber is variable depending on your test data.)

Print a quick slip before the patch - the renewal will not show up as one of today's issues.
Print a quick slip after the patch - the renewal will show up as one of today's issues.

If you need reasoning as to why a renewal should show up on the quick slip, think of it as a record of everything
a borrower did today, without the hassle of overdues.

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-02-24 10:10:30 -05:00
Jared Camins-Esakov
da4df6adb6 Merge branch 'bug_9356' into 3.12-master 2013-02-24 10:00:57 -05:00
11f91dc316 Bug 9356: Show Dissertation note (MARC21 502) in XSLT
Shows dissertation note in OPAC and intranet detail pages.

To test:
1) Look at records with and without 502 in intranet and OPAC
2) Verify display is correct and consistent

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
All tests pass in staff and opac
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-24 10:00:54 -05:00
22a3a4089f Bug 9356: Follow-up - fix capitalization in MARC21 XSLT detail pages
Fixes spelling to follow capitalization rules in OPAC and intranet MARC21
detail pages.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Changes all look good.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-24 10:00:54 -05:00
Jared Camins-Esakov
0fa2b7ad3d Merge branch 'bug_9363' into 3.12-master 2013-02-24 09:58:05 -05:00
cdb6c1e363 Bug 9363: Show Patent control information and report number (MARC21, XSLT, detail pages)
Adds 088 $a and 013 $a,c,d,e,f to OPAC and intranet detail pages for MARC21 and XSLT.

To test:
 1) Check records with single and multiple 013 and 088 fields with different subfields catalogued.
 2) Check records with no 088 or 013 present.
 3) Verify display is ok and consistent.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Verified in opac and staff client by following all tests.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-24 09:58:00 -05:00
Jared Camins-Esakov
0b3b23e46f Merge branch 'bug_9662' into 3.12-master 2013-02-20 09:56:00 -05:00
220fb3f657 Bug 9662: Followup for acquisition
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Trivial change corresponding with Dobrica's patch at cataloging side.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 09:55:54 -05:00
Dobrica Pavlinusic
8abe29b253 Bug 9662 - ISSN search field not passed to Z3950Search
Seems like simple omission when passing $pars hash to
Z3950Search function.

Test scenario:

1. select any Z39.50 search form and enter valid ISSN
2. verify that you don't get any results from remote servers
3. apply this patch and re-check that results are now availble
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 09:55:54 -05:00
Jared Camins-Esakov
43295d9834 Merge branch 'bug_5888' into 3.12-master 2013-02-20 09:52:35 -05:00
Jared Camins-Esakov
da9046fceb Bug 5888: Increment version number
Database update for bug 5888 has been given version 3.11.00.021
2013-02-20 09:52:27 -05:00
20b46286ad Bug 5888: Followup for preference description
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Added for trivial string change in finalizing QA.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 09:52:09 -05:00
Jonathan Druart
23cf829391 Bug 5888: Add label for each entry in the authors list
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 09:52:03 -05:00
Jonathan Druart
4293901baf Bug 5888: Followup add a syspref (OPACPopupAuthorsSearch)
New syspref OPACPopupAuthorsSearch.
If it is disabled, the development has no effect.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 09:48:42 -05:00
Julian Maurice
70a639a707 Bug 5888: Fix building of query in authors links
'all' checkbox was taken into account, resulting in the string 'on and'
added to beginning of query.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 09:48:40 -05:00
Julian Maurice
9a3d28e203 Bug 5888: opac-detail subject/author links improvements
When the user clicks on a subject or an author, the list of subjects
(authors) is displayed and the user can choose more than 1 subject
(author) to search on.
Also added a link to opac-authoritiesdetail.pl when possible.

Only affects 'Normal view'. Does not affect XSLT display.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Split out of the original patch for bug 5888. The links to the
authority records are added by bug 8210.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 09:48:33 -05:00
Jared Camins-Esakov
b2a77e87f8 Merge branch 'bug_8913' into 3.12-master 2013-02-20 09:17:36 -05:00
81c90ba3bf Bug 8913 [Revised] Improve acquisitions navigation
This patch adds a new menu for vendor-related pages in which
vendor related "views" can be linked to: baskets, basket groups,
contracts, invoices, uncertain prices.

The acquisitions toolbar is pared down to vendor-related actions:
New basket, contract, or vendor; edit vendor, delete vendor,
receive shipment.

Other small improvements have been made to other pages: corrections
to breadcrumbs and title tags, adding useful links betweeen pages.

Vendor menu and toolbar are added to booksellers.pl
when there is only one "search result" (i.e. a vendor id is passed).

- Menu appears when booksellerid variable is present
- Redundant heading removed
- Additional variables added to enable proper display of the toolbar

- Revision corrects broken links pointed out by QA.
- Revision adds check of existing baskets and subscriptions as a
  condition on display of the vendor delete button.

TODO: Add coverage of Basket groups page.

To test, navigate Acquisitions pages and test as many links and buttons
as you can, confirming that nothing is broken on vendor pages, invoice
pages, contract pages, uncertain price pages, etc.

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

All tests pass - I like this very much!

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.

Tests done:
1) New toolbar - vendor search
  - no results = button to create new vendor shows
  - 1 result = additional new options show
  - more than one result = button to create new vendor shows

2) Vendor views
  - acq toolbar consistent with 1 result in vendor search
  - new tabs on the left
  - checked all links have the needed parameters and work correctly

3) New toolbar - different pages
  - Toolbar is formatted consistently
  - Delete vendor shows only up when it should - no baskets or
    subscriptions
  - Links work correctly

Works nicely, great groundwork for further improvements.

TODO Add new toolbar to (new) invoices page.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 09:17:21 -05:00
Jared Camins-Esakov
0bb9d984d4 Merge branch 'bug_8347' into 3.12-master 2013-02-20 09:07:45 -05:00
Jared Camins-Esakov
91d91583bd Bug 8347: Increment version number
Database update for bug 8347 has been given version 3.11.00.020
2013-02-20 09:07:31 -05:00
Vitor FERNANDES
93ba3b8560 Bug 8347 - Koha forces UNIMARC 100 field code language to 'fre'
Changed Charset.pm to use defaultlanguage instead of 'fre'.

Signed-off-by: Rolando Isodoro <rolando.isidoro@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.

1) Check system preference was added correctly:
   UNIMARCField100Language
2) Change code in preference to be not 'fre'.
3) Catalog a bibliographic record.
  - check plugin shows new value
  - check empty field is filled with new value from the plugin
  - check you can still edit it to be something else

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 09:06:57 -05:00
Vitor FERNANDES
a7eb883282 Bug 8347 - Koha forces UNIMARC 100 field code language to 'fre'
Forget to add the system preference to the template.

Signed-off-by: Rolando Isodoro <rolando.isidoro@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 09:06:31 -05:00
Vitor FERNANDES
16a395c3b7 Bug 8347 - Koha forces UNIMARC 100 field code language to 'fre'
Added a new system preference to set the UNIMARC field 100 default language.
The default value for that system preference is 'fre'.
Changed Biblio.pm to use the system preference:

- if the language is bad filled in the preferences it uses 'fre' as default value
- only replaces the language when the field 100 is empty
- if the language is filled with the plugin only replaces the positions 25-28 to 'y50'

Signed-off-by: Rolando Isodoro <rolando.isidoro@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 09:06:09 -05:00
Jared Camins-Esakov
3b3a54e147 Merge branch 'bug_9145' into 3.12-master 2013-02-20 08:42:29 -05:00
Jared Camins-Esakov
46a19b2747 Bug 9145: Increment version number
Database update for bug 9145 has been given version 3.11.00.019
2013-02-20 08:42:14 -05:00
Vitor FERNANDES
2b5067b0f9 BUG 9145: Authorities: standard language for UNIMARC
New Authority system preference created UNIMARCAuthorityField100 with default value "afrey50      ba0".
AuthoritiesMarc.pm uses the system preference instead of label "afrey50      ba0".

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, all tests and QA script pass.

1) Check system preference is created correctly.
2) Change pref.
3) Catalog a new authority.
4) Change framework to make 100 show in frameworks or check in the
   the database, that now 100 has the new defined value.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 08:42:10 -05:00
Jared Camins-Esakov
0f748d7e42 Merge branch 'bug_9615' into 3.12-master 2013-02-20 08:29:35 -05:00
0cdef9334d Bug 9615 - Combine staff home page images into single sprite
In order to reduce the number of concurrent downloads on the staff
client home page the images representing the various modules (circ,
patrons, etc) could be combined into one sprite.

This patch creates a new sprite containing all images and corrects the
CSS for the default and hover states of each link to match the previous
version. The separate images have been removed. Also added is a
GIMP-compatible Photoshop file from which the sprite is generated.

To test, apply the patch, clear your browser cache, and view the staff
client home page. Each module icon should look correct in its default
and hover states.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Comment: Work as described, Good idea! No errors.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, no problems found.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 08:29:22 -05:00
Jared Camins-Esakov
932cbebb8f Merge branch 'bug_9625' into 3.12-master 2013-02-20 08:27:31 -05:00
d60c282ba0 Bug 9625 - Replace YUI buttons and menus on reports pages with Bootstrap
This patch converts the toolbar include file used by guided/SQL report
pages to Bootstrap, replacing YUI button and menu code with Bootstrap
markup.

To test, view any page in reports/ which uses reports-toolbar.inc
(Saved reports, Guided reports, SQL reports). Buttons and menus should
look correct and work correctly.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Comment: Works as described. No errors.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely, logic is correct. Toolbar differs, depending
on the action: show report, list of reports, edit report.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 08:27:15 -05:00
Jared Camins-Esakov
db67fa3854 Merge branch 'bug_9650' into 3.12-master 2013-02-20 08:25:35 -05:00
a03c6ce587 Bug 9650 - Show message if there are no notices
When there are no notices for the selected library, the
interface displays a table header with an empty table.

This patch adds a message which appears when there are no
notices for the selected library, or if no library selected
and there are no notices at all.

To test, visit the notices and slips page and
select a library for which there are no notices. A message
should be displayed, "There are no notices for this library."

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Comment: Work as described. No errors.
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 08:25:33 -05:00
Jared Camins-Esakov
45a7d554ea Merge branch 'bug_9455' into 3.12-master 2013-02-20 08:23:16 -05:00
Colin Campbell
1dabb45a50 Bug 9455: Remove unnecessary quoting from sql
Wa've removed the mysql specific back quotes from sql files
But this case remained of them embedded in an sql string
Also removed the unnecessary call to finish
and temporary variable in the subroutine return

Testing: Functionality should remain unchanged. Retrieval of
basketgroups in acquisitions should not be affected

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

Works according to test instructions: Basketgroups
functionality appears to work normally.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Checked SQL produces the same results as before and did some
tests on the basket group functionality.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 08:23:13 -05:00
Jared Camins-Esakov
e0df9b5e59 Merge branch 'bug_9658' into 3.12-master 2013-02-20 08:22:00 -05:00
Jared Camins-Esakov
aeb61b7528 Bug 9658: Incorrect breadcrumb on report dictionary
Prior to this patch, the breadcrumb on the reports dictionary looks
like this: Home > Reports > Guided reports wizard Dictionary (notice
the lack of punctuation between "wizard" and "Dictionary").
This patch makes it consistent with the rest of the system so it looks
like this: Home > Reports > Guided reports wizard > Dictionary

I left dictionary bolded, since that seems to have been intentional,
even if I can't find a good reason for it.

To test:
1) View reports dictionary page before and after patch is applied,
   observing difference.

Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>

Comment: Trivial patch. Work as described. No errors
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 08:21:56 -05:00
Jared Camins-Esakov
257f511bf2 Merge branch 'bug_9655' into 3.12-master 2013-02-20 08:20:50 -05:00
Bernardo Gonzalez Kriegel
d2c627fff7 Bug 9655 - Capitalization wrong on 'Close and Print' button in basket groups
This patch fix button capitalization on basket groups for a vendor.

To test:
1) Go to Acquisitions, search for a vendor, click on vendor name,
Manage orders > Basquet groups
2) On Open tab, action button "Close and Print" has incorrect capitalization.
3) Apply the patch
4) Reload or repeat 1-2, capitalization fixed.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works perfectly.

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 08:20:47 -05:00
Jared Camins-Esakov
7dd65f3a9d Merge branch 'bug_9582' into 3.12-master 2013-02-20 08:17:36 -05:00
Jared Camins-Esakov
7c0edbc315 Bug 9582: Remove unused code from members/pay.pl
The subroutines writeoff() and get_writeoff_sth() (and the two package
variables $writeoff_sth and $add_writeoff_sth) defined in members/pay.pl
are not used at all.

To test:
1) View members/pay.pl by looking at the record of a patron who has
   at least seven fines/fees and clicking the "Pay fines" tab after
   clicking the "Fines" tab on the left side
2) Write off a single item in the table on members/pay.pl using the
   button labelled "Write off"
3) Pay a single fine by clicking the "Pay" button
4) Pay a portion of a fine by selecting a checkbox on one of the lines
   in the table and clicking the "Pay amount" button
5) Select two lines in the table and click the "Pay selected" button
6) Write off all remaining fines

If all your actions show up in the table on the Account tab, this patch
works.

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-02-20 08:17:34 -05:00
Jared Camins-Esakov
0ddbc792b9 Merge branch 'bug_8079' into 3.12-master 2013-02-20 08:16:28 -05:00
c13e8e5275 Bug 8079 - opac not showing fines - says 'no'
Make charges of type FU be counted for opac-user.pl

Test Plan:
1) Checkout an item to a patron, back date the date due enough to create fines
2) Run fines.pl
3) Log into the patron's account via the OPAC
4) Note the fines line for that issue says 'No'
5) Apply patch
6) Reload opac-user.pl, not the fines column now says 'Yes'

Signed-off-by: David Cook <dcook@prosentient.com.au>

Works great, Kyle. Seeing as my test patron had $4500 in fines for that item, I was glad to see that column switch to "Yes" ;).

I'm not sure what the difference is between FU and F is, or what L means, but the patch works, so I'm signing off.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
This works as described, all tests and QA script are ok.
Note: why show yes and not the fine amount?
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-02-20 08:16:24 -05:00
Jared Camins-Esakov
dd9520a7e5 Merge branch 'bug_9651' into 3.12-master 2013-02-20 08:00:42 -05:00