koha:master

Last commit made on 2015-08-17
Get this branch:
git clone -b master https://git.launchpad.net/koha
Members of Koha Release Team can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
master
Repository:
lp:koha

Recent commits

dfe07fa... by Tamil on 2015-07-23

Bug 14592: Export data bad encoding

Tools > Export data produces a file badly encoded, when marc/xml file
format is chosen. It works with CSV.

To test:

1. Tools > Export data
2. Choose a limited interval of biblionumber
3. Export in marc/xml/csv.
4. Check files exported at 3: csv file is ok. marc/xml files are
   corrupted, ie badly encoded.
5. Apply the patch
6. Repeat steps 3&4, and confirm that all file formats are valid.

Signed-off-by: Tomas Cohen Arazi <email address hidden>

Signed-off-by: Katrin Fischer <email address hidden>
Signed-off-by: Tomas Cohen Arazi <email address hidden>

62f3fd6... by Tomas Cohen Arazi <email address hidden> on 2015-08-11

Bug 13485: DBRev 3.21.00.018

Signed-off-by: Tomas Cohen Arazi <email address hidden>

cb1ac9f... by Jonathan Druart <email address hidden> on 2015-08-05

Bug 13485: Use the Koha template plugin to access syspref values

And remove the useless use of the KohaDates plugin

Signed-off-by: Jonathan Druart <email address hidden>
Signed-off-by: Tomas Cohen Arazi <email address hidden>

43fadba... by Simith D'Oliveira <email address hidden> on 2014-12-19

Bug 13485: Add a page to display links to restricted sites

To test:

I) Apply the patch
II) Run updatedatabase.pl

scenario I)

1) Add some content in RestrictedPageContent and RestrictedPageTitle sysprefs.
2) Add your machine ip (ex. 127.0.0)
3) Validate cgi-bin/koha/opac-proxypage.pl shows a page with RestrictedPageContent and RestrictedPageTitle contents.

scenario II)

1) Logout opac page
2) Add some content in RestrictedPageContent and RestrictedPageTitle sysprefs.
3) Add other ip that your machine ip.
4) Validate: cgi-bin/koha/opac-proxypage.pl shows a login page.
5) Validate: cgi-bin/koha/opac-proxypage.pl shows a page with RestrictedPageContent and RestrictedPageTitle contents after login.

Followed both scenarios, works as expected.
Signed-off-by: Marc Veron <email address hidden>

Signed-off-by: Kyle M Hall <email address hidden>

Bug 13485 [QA Followup]

Signed-off-by: Kyle M Hall <email address hidden>

Bug 13485 - Atomic Update + Rename Proxy page to Restricted page

Test plan:

I) Apply the patch
II) Run updatedatabase.pl

scenario I)

1) Add some content in RestrictedPageContent and RestrictedPageTitle sysprefs.
2) Add your machine ip (ex. 127.0.0)
3) Validate cgi-bin/koha/opac-restrictedpage.pl shows a page with RestrictedPageContent and RestrictedPageTitle contents.

scenario II)

1) Logout opac page
2) Add some content in RestrictedPageContent and RestrictedPageTitle sysprefs.
3) Add a diffrent ip.
4) Validate: cgi-bin/koha/opac-restrictedpage.pl shows a login page.
5) Validate: cgi-bin/koha/opac-restrictedpage.pl shows a page with RestrictedPageContent and RestrictedPageTitle contents after login.

 new file: installer/data/mysql/atomicupdate/Bug13485_RestrictedSitesPage.sql
 modified: installer/data/mysql/sysprefs.sql
 modified: koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
 renamed: koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-proxypage.tt -> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-restrictedpage.tt
 renamed: opac/opac-proxypage.pl -> opac/opac-restrictedpage.pl

Signed-off-by: Jonathan Druart <email address hidden>
Signed-off-by: Tomas Cohen Arazi <email address hidden>

dcb5bf0... by Jonathan Druart <email address hidden> on 2015-07-02

Bug 13853: (follow-up) unit tests

Specify the reference, we should receive Koha::Object.

Signed-off-by: Jonathan Druart <email address hidden>
Signed-off-by: Tomas Cohen Arazi <email address hidden>

ae82953... by Kyle M Hall <email address hidden> on 2015-06-25

Bug 13853: (QA followup) Add unit tests for branch getting methods

Signed-off-by: Jonathan Druart <email address hidden>
Signed-off-by: Tomas Cohen Arazi <email address hidden>

7135bae... by Jonathan Druart <email address hidden> on 2015-06-19

Bug 13853: Add tests for is_waiting

Signed-off-by: Jonathan Druart <email address hidden>
Signed-off-by: Tomas Cohen Arazi <email address hidden>

47be5ca... by Kyle M Hall <email address hidden> on 2015-03-17

Bug 13853: Show waiting hold expiration date for waiting holds in holds ajax datatable

We should show the expiration date for waiting holds in the holds
datatable that appears in circulation.pl and moremember.pl

Test Plan:
1) Ensure ReservesMaxPickUpDelay is set
2) Place a hold on a record
3) Place a second hold and set it to waiting by checking it in
4) Place a third hold with an expiration date
5) View the holds tab on circulation.pl and moremember.pl
6) Note the first hold has no expiration date
7) Note the second hold has an expiration date of today + ReservesMaxPickUpDelay days
8) Note the thrid hold has an expiration date of whatever you set it to

Signed-off-by: Kyle M Hall <email address hidden>

Signed-off-by: Cathi Wiggins <email address hidden>

Signed-off-by: Megan Wianecki <email address hidden>

Signed-off-by: Jonathan Druart <email address hidden>
Signed-off-by: Tomas Cohen Arazi <email address hidden>

82ce53c... by Jonathan Druart <email address hidden> on 2015-06-19

Bug 13030: Remove the unnecessary double call

Signed-off-by: Jonathan Druart <email address hidden>
Signed-off-by: Tomas Cohen Arazi <email address hidden>

f081063... by Kyle M Hall <email address hidden> on 2014-10-08

Bug 13030: Show waiting hold expiration date for waiting holds on circulation.pl

We should show the date a waiting hold is set to expire for each hold in
the list of waiting holds in circulation.pl

Test Plan:
1) Apply this patch
2) Find a waiting hold for a patron, browser to circulation.pl
   for that patron
3) Set system preference ReservesMaxPickUpDelay to 5
4) Refresh circulation.pl, note the waiting holds now display a
   "waiting until" part with the waiting date plus 5 days
5) Set system preference ReservesMaxPickUpDelay to 0 ( or empty
   string )
6) Refresh circulation.pl, note the waiting hols no longer have a
   "waiting until" line.

Signed-off-by: Owen Leonard <email address hidden>
Followed test plan successfully. Automated tests successful.

Signed-off-by: Kyle M Hall <email address hidden>

Signed-off-by: Cathi Wiggins <email address hidden>

Signed-off-by: Megan Wianecki <email address hidden>

Bug 13030 [QA Followup] - Fix unit tests

Signed-off-by: Jonathan Druart <email address hidden>
Signed-off-by: Tomas Cohen Arazi <email address hidden>