Commit graph

19061 commits

Author SHA1 Message Date
Jared Camins-Esakov
5b38b1d0e1 Merge branch 'bug_10053' into 3.14-master 2013-05-01 07:37:30 -04:00
Jonathan Druart
09d36cee3c Bug 10053: borrowers.branchcode cannot be null
The DB field borrowers.branchcode cannot be null (`branchcode`
varchar(10) NOT NULL default ''). However, an empty value can be selected
on creating/updating a patron.

Test plan:
- Add or edit a patron and choose the empty value for library
(branchcode).
- Save (pref BorrowerMandatoryField must not contain branchcode).
- Mysql raises an error.
- Apply the path.
- Check that you are not able to select no library.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 07:37:27 -04:00
Jared Camins-Esakov
209863e5e4 Merge branch 'bug_10097' into 3.14-master 2013-05-01 07:34:22 -04:00
01f7542f4b Bug 10097 - Hide framework selection when importing staged authority records
Currently, when importing authority records using the "Manage staged
MARC records" tool, it will show the text "Add new bibliographic records
into this framework:" followed by a drop-down menu of possible frameworks.

Since these are bibliographic frameworks and we're importing authority
records which do not use them, we have no need to show this information.

I'm proposing just a little patch to display this info only for
bibliographic records. From my tests, everything seems to work fine
without this text and the drop-down, although I've only uploaded one
MARC21 authority record at a time.

--

Test Plan:

Before applying patch...

1) Find yourself an authority record. I recommend downloading your
favourite author from: http://authorities.loc.gov/
2) Stage MARC for import. Choose "Authority" as your record type.
3) Go to "Manage staged records"
4) Underneath the button "Import this batch into the catalog", you
should see the text "Add new bibliographic records into this framework:"
followed by a drop-down of the available frameworks.

Optionally) You can also try this for bibliographic records. You'll find
the same.

After applying the patch...

5) Repeat steps 2 and 3.
6) Underneath the button "Import this batch into the catalog", you
should just see a table listing your MARC record(s).
7) Stage MARC for import. Choose "Bibliographic" as your record type.
8) Go to "Manage staged records".
9) You should find step 4 still to be true (i.e. the "Add new
bibliographic..." text should still be there).

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Small template change, passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 07:34:20 -04:00
Jared Camins-Esakov
2e1eca842c Merge branch 'bug_9719' into 3.14-master 2013-05-01 07:27:04 -04:00
020b8a66bc Bug 9719 - Changing the rows per page on a custom report fails if it has user supplied parameters
If you create an SQL report that includes one or more parameters,
using the 'rows per page' pulldown does not work. Instead, it will
prompt for the parameters again and shows the first page of output.

Test Plan:
1) Create a new report from sql as follows:
    SELECT * FROM borrowers WHERE surname LIKE <<Last Name>> AND firstname LIKE <<First Name>>
2) Run this report
3) Change the 'Rows per page' and click 'Update'
4) This should kick you back to the start where the report asks you for your parameters
5) Apply the patch
6) Repeat step 3, this time is should work correctly

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works nicely now. All tests and QA script pass.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 07:27:01 -04:00
Jared Camins-Esakov
21f190c86a Merge branch 'bug_9957' into 3.14-master 2013-05-01 07:22:31 -04:00
559ff89fd6 Bug 9957 - Missing cancel link on subfield editing page
The subfield edit page has an edit bottom at the top of the page. Almost
no other edit screens do this. It would be more consistent to put it at
the bottom. Also missing is a "cancel" link. This patch fixes both
issues.

The patch also adds "Default" to the breadcrumbs when editing a subfield
in the default framework.

To test, apply the patch and edit a subfield: MARC frameworks -> MARC
structure -> Subfields -> Edit. The "Save changes" button should appear
at the bottom of the page alonside a "Cancel" link. Both should work
correctly.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template change only, improves consistency and works
nicely.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 07:22:29 -04:00
Jared Camins-Esakov
a769f29d56 Merge branch 'bug_9266' into 3.14-master 2013-05-01 07:19:26 -04:00
acfbfcb7d9 Bug 9266 - Untranslated strings in tags moderation
There are a couple of English strings in tags moderation JavaScript
which are not properly enclosed in the _() function enabling
translation. As a result, clicking a translated 'Approve' or
'Reject' button in the table of tags would change the button's
neighbor's label to the English string. This patch
corrects it.

To test, apply the patch and regenerate a translation to test with. Go
to Tools -> Tags and find a list of tags to moderate (pending, approved,
or rejected). When you click on an 'Approve' or 'Reject' tag in the
table of tags, the buttons in each Approve/Reject pair should retain
their correct translated label. For instance, looking at approved tags
in French:

[ Approuvé ] [ Rejeter ]

Clicking the "Rejetee" button should change the state to:

[ Approuver ] [ Rejetée ]

Clicking "Approuver" should return the buttons to the first state.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 07:19:08 -04:00
Jared Camins-Esakov
c04260dbaf Merge branch 'bug_7143' into 3.14-master 2013-05-01 07:15:00 -04:00
Jared Camins-Esakov
78d32cc138 Bug 7143: Add missing contributor to about page 2013-05-01 07:14:44 -04:00
D Ruth Bavousett
80d926ea60 Bug 7143: Updating the About page with translation teams for Basque and Turkish
Text-change only, should require little QA and testing.
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template change only, changes look correct to me.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 07:13:12 -04:00
c641fd0b95 Bug 7143 Followup for some new developers on about page
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template change only - changes look correct to me.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 07:13:12 -04:00
Jared Camins-Esakov
2d44f03e9f Merge branch 'bug_10111' into 3.14-master 2013-05-01 07:09:25 -04:00
72c95fa1cc Bug 10111 - Layout on basket summary page a bit inconsistent
Some details in the summary of basket information were not marked up
consistently with others on the page. This patch makes the markup
consistent for a consistent appearance.

To test, view a basket in Acquisitions which is part of a basketgroup.
Information should be displayed consistently for baksets in both open
and closed basket groups.

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Works as expected

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template change only, works nicely.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 07:09:22 -04:00
Jared Camins-Esakov
d5f51e8d8d Merge branch 'bug_6709' into 3.14-master 2013-05-01 06:55:44 -04:00
Bernardo Gonzalez Kriegel
b6518e632d Bug 6709 - marc21_field_006.xml and marc21_field_008.xml can't be translated
This patch changes
1) structure and schema for xml files used in MARC21
006 and 008 value builders.
2) JavaScript functions used to show value builders.

Xml processing is enabled in previous patch

Any translatable string has been moved to an xml element,
those strings that no need translation remains as xml
attributes.

NOTE_1: I do not include as translatable material types
codes, because those values are restricted in schema
definition. But this restriction can be removed.

NOTE_2: Anyone with experience in XML/XSD please
check the new schema definition.

NOTE_3: Anyone with experience in the former and
JavaScript please check xmlControlfield.js

To test:
1) Apply the patch
2) Verify that 006 and 008 value builders show and work
properly
3) Update translation files for your favorite language,
a new set of strings must show up corresponding to
names and descriptions on value builders.

Note: messed up patches, sending again.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
All tests and QA script pass.

Did regression tests on the plugins for 006 and 008 and could
spot no differences in behavior of the plugins to before.

Also tested the translation process and found it working nicely.
Thank you for fixing this long standing translation bug!
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 06:53:38 -04:00
Chris Cormack
3588e2820e Bug 6709 : Patch for testing translating .xml files
Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comment on second patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 06:53:38 -04:00
Jared Camins-Esakov
3688a918cf Merge branch 'bug_10143' into 3.14-master 2013-05-01 06:47:52 -04:00
c82facc012 Bug 10143 - Fixing license headers
Some files have the old 59 Temple address instead of the 51 Franklin
street.

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

I see lots more which will need to be corrected as well.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Corrects addresses in 3 files.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 06:47:50 -04:00
Jared Camins-Esakov
9aa2e6fd75 Merge branch 'bug_10022' into 3.14-master 2013-05-01 06:44:26 -04:00
Fridolyn SOMERS
86511b380f Bug 10022 - Multiple tags moderation doesn't work on translated page
When using a translated intranet, tags moderation using checkboxes and a
submit button doesn't work. You get a message "Unknown Operation on x
Term(s)" (translated of course).

This patch corrects by using name="op-[operation]" instead of name="op"
in each submit input.

Test plan :
- Create a new tag on a record
- Go to tags moderation in Tools
=> You should see your tag in pending terms
- Click on checkbox
- Click on Approve or Reject submit button at the bottom of the table
=> Without patch the tag is still pending
=> With patch operation is well performed, tag is not pending
- Test "Check lists" form
- Test Approve and Reject buttons from "Actions" column

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
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-05-01 06:44:24 -04:00
Jared Camins-Esakov
d1db0064a2 Merge branch 'bug_10017' into 3.14-master 2013-05-01 06:39:45 -04:00
Karam Qubsi
11820f3c17 Bug 10017: Follow up handling with the multi libraries pref active
This Follow up patch will handle multi libraries pref
when it sets to "add" and enhance the way lists drop down menu appear

 Test plan for all patches ( the first one and  all follow ups )  :
 1- apply the patches ( from the first one and all follow up patches)
 2- use 3.10 po files and update it (for the master) "
    ../misc/translate/ perl translate update ar-Arab "
 3- install Arabic from the updated po files
    "perl translate install ar-Arab "
 4- set opac opacthemes pref to ccsr
 5- set OpacAddMastheadLibraryPulldown pref to add
 6- select the Arabic from the opaclanguages pref
 7- set opaclanguagesdisplay  to allow
 8- go to the opac and choose  arabic
 9- you will see all the directions from right to left
    (as you look at koha on a mirror ;) ))

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

Comment: Work as decribed. No errors.
With all patches applied, we get a pretty RTL interface.
Well done!

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Changes are mostly CSS, one new image and a tiny template change.
Used po files from 3.8 for testing. Looks good!
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 06:39:30 -04:00
Karam Qubsi
da5b3c0cda Bug 10017: Follow up OPAC-CCSR-Right-to-left-css
This follow up patch will delete the "-moz-box-sizing"
property that I was add when I'm doing some tests on
the rtl css file and  I forgot to delete it

many thanks David Cook for your notes deleting that property will not effect  on the results

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

Comment on last patch.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comment on last patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 06:39:19 -04:00
Karam Qubsi
2beeedafbe Bug 10017: Fix CSS for right-to-left in CCSR theme
This patch will add css file for the Opac CCSR
link this css file in the doc-head-close.inc
and add new image : arrow-left-grey-11x6.png
for the opposite direction of the right existing one.

the test plan is the same for the oldest patches
for opac prog and intranet ...

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

Comment on last patch.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Comment on last patch.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 06:38:40 -04:00
Jared Camins-Esakov
1d4c5af695 Merge branch 'bug_10083' into 3.14-master 2013-05-01 06:33:38 -04:00
284e3e0d31 Bug 10083 - In Transit string doesn't get translated in the staff interface
For some reason this text inside a <td> isn't getting picked up by the
translator unless it's inside a <span>. This patch adds the span and
tidies up the text.

To test, apply the patch and "translate update" a translation. Searching
the po file for "In transit from" should return a result from detail.pl.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template only change fixing a translation problem.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 06:33:36 -04:00
Jared Camins-Esakov
3eb0d805fe Merge branch 'bug_10145' into 3.14-master 2013-05-01 06:28:38 -04:00
Jonathan Druart
53cdc66a0e Bug 10145: The acquisition details block is badly placed.
Bug 5335 introduced a new "Acquisition details" block on the
subscription details page.
It is placed between to tabs and causes an ergonomic issue.

Test plan:
- Order a subscription.
- Go on the subscription detail page and select a tab.
- The "Acquisition details" block is moved from the bottom to the top of
the table.
- Apply the patch
- The "Acquisition details" block is always on the bottom of the table.

Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Fixes display problem, passes all tests.
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-05-01 06:28:35 -04:00
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