Commit Graph

14573 Commits

Author SHA1 Message Date
Srdjan Jankovic 6773772d59 bug_6974: bugfix: do not create empty record before building input for new biblio
It messes up javascript default values

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4c1ea37e63)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 17:53:35 -04:00
Chris Cormack e5f2ddb2be Bug 6958 : Fix for leading spaces being stripped on translation
This will re-add any leading spaces, so formatting is not messed

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
- all examples from the bug report are fixed now
- verified system preferences are still translated
- verified xslt displays are still translated
- verified javascript alerts are still translated
- verified switching languages works

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
(cherry picked from commit 873091dcc8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 17:53:19 -04:00
D Ruth Bavousett 37ef2f1830 Bug 6867: Date last seen ignored on import
The date last seen field (952 $r) and replacement price date (952 $w) were being
ignored on import, being replaced with NOW() as a hardcoded value.  This patch will
allow a value to be imported, but if none is, it will use the ISO date of import
as a default.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit b1e6aadf56)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 17:47:42 -04:00
Ian Walls 4c774d23f9 Bug 6633: SCO return button doesn't work
A template toolkit scope issue was preventing the Renew button from working properly, as well as displaying
the fines column even if no fines column header was displaying.

This patch adjusts the scope of several T:T variables on the sco-main template to fix this

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a291cc52ca)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 17:47:23 -04:00
Ian Walls cac61e967c Bug 6733: change branchcode call in Labels to use userenv instead of LoginBranchname
In the 5 places in the label editor, the user's current branch is determined by taking
the LoginBranchname and doing a reverse look up for the branchcode.  This is an unnecessary
query, since C4::Context->userenv has the immediate access to the branchcode; this is how
it's summoned in all other points in the Koha code.

This addresses bug 6673 because, since the move to T:T, the call in tools/manage-marc-import.pl
has used in correct syntax:  $template->param('LoginBranchname') instead of $template->{VARS}->param('LoginBranchname')

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 973371a68b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 17:47:06 -04:00
Chris Cormack 19cd06bbcf Updating history and about file
(cherry picked from commit 405ee6844d)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 17:43:20 -04:00
Liz Rea 05b2ca07b6 Bug 6927-- Typo in C4::Overdues.pm
Corrected a small typo in overdues.pm to fix a "Undefined subroutine &C4::Members::checkoverdues called at /home/koha/kohaclone/C4/Members.pm line 511." when making calls to GetMemberDetails

This fix suggested by Elliot Davis of UT Tyler, and he did the testing -- I'm just submitting the fix to master for him.  :)

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 085de44ebd)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 17:43:00 -04:00
Owen Leonard 62520c247a Fix for Bug 6872 - Can't set default SMS messaging options for patron category
Passing SMS driver preference value to the template so that SMS
options can be displayed when appropriate.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 5d5c4a67ec)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 17:42:43 -04:00
Ian Walls 27de4e13e4 Bug 6801: checkoverdues returns unnecessary fields, causing slowness
Explicitly specifies which fields to return in C4::Overdues::checkoverdues
SQL:  all of biblio, items, and issues, and everything in biblioitems
EXCEPT marc, marcxml and timestamp.

Bug 6801: member details page taking long time to load when many checkouts present

This patch removes the call to GetMemberDetails in build_issue_data; this heavy-weight
subroutine was being run for every single item a patron (or their relatives) have checked out.
Instead, the borrowers first name, surname and cardnumber are added to the GetPendingIssues query.
I believe this is reasonable since GetPendingIssues can now return issues for multiple borrowers.

Also corrects the $borrowernumber used for GetIssuesCharges and CanItemBeRenewed; was using the borrower whose
page we were on, NOT the borrower of that specific item (which would be different in the Relatives Checkouts tab).

Template calls to [% scope.borrowername %] are now broken up into [% scope.firstname %] [% scope.surname %].

Signed-off-by: Liz Rea <lrea@nekls.org>
On my test data, a patron with 180 checkouts (without this patch) would take more than a minute to bring back the circulation.pl and moremember.pl pages.
With this patch, the time is reduced to 5 or so seconds.

Big ups to Ian for tenaciously hunting this one down.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 17:42:14 -04:00
Larry Baerveldt 9898e6d50e Bug 4841: biblio-level itemtypes not searchable in advance search by itype
Mapping 942$c into itype index along with 952$y; this allows for biblios without any items, but with a biblio-level itemtype to be retrieved in search. This is particularly useful for E-books or Serials without barcoded items.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d5a886201c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 17:34:27 -04:00
Chris Cormack 35edcc2147 Adding new developer to history
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 17:27:46 -04:00
Janusz Kaczmarek 3a0861c5da Bug 6465 - Errors in UNIMARC plugins for fixed length fields (for | and space) (T::T issue)
A corrected version of the patch of 6 June 2011.

Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0d480bbf5c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 12:53:38 -04:00
Chris Cormack 459c3c7b76 Fixing a broken test
(cherry picked from commit 7244d5060b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 12:52:54 -04:00
Meenakshi.R 0155ee41e6 Bug:6781--Log membership renewal
If patron related logging is tuned on, log membership renewal

Signed-off-by: Amit Gupta <amit.gupta@osslabs.biz>
Signed-off-by: Nicole Engard <nengard@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8b75f5b38c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 12:52:40 -04:00
Frédéric Demians fc107f0595 Bug 6649 Allow help screens editing
edithelp.pl hadn't been updated to allow help screen editing.

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

Only a note: Apparently you need to be 'superlibrarian' permission
to edit help pages.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit f640a3ea5f)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 12:52:12 -04:00
Robin Sheat e57c54c332 Bug 6205 - if an include doesn't exist, fall back to en
If a language that doesn't exist gets accessed, then it will fall back
to en for the templates, but not for the includes, so everything still
dies. This allows the process to work in this case too.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>

I confirm the bug and the solution. This issue occurs when templates are
partially translated. The main template (.tt) is found for a specific
language, so this language is returned by themetemplate. But in the main
template, some include files (subtemplates) are referenced that can very
well not exist if the translation process had failed to generate them.
This kind of failure is reported by 'translate' script. It's very easy
to miss it, but it's the translator responsability to check it.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 62b76aa98c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 12:50:53 -04:00
Liz Rea c48fcbc8e9 Bug 6871 - add schema and sql library reports to guided reports sidebar
This patch adds links for schema.k-c.org and the sql report library to the guided reports sidebar.

Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9f688ab5bc)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 12:50:36 -04:00
Joy Nelson 8303c4dbf8 Bug 6773: circ/ysearch.pl is unlimited
Added a LIMIT 10 to the SQL statement
Edited the circulation.pref stating that autocomplete returns the first 10 results at a time

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 38ca8d6de1)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 12:50:20 -04:00
Owen Leonard 0e1283413a Fix for Bug 6884, Improve TinyMCE configuration on Koha News page
- Increases the width of the editor to fill the space provided
- Adjusts the layout of the toolbars to better fit the space
- Adds a custom editor stylesheet to make the contents of the
  editor better match the expected output

In changing the toolbar configuration I chose to make the display
of each button explicit rather than assuming a default set of
buttons and adding or subtracting from that. I think this is
clearer for someone approaching the configuration trying to under-
stand how buttons are displayed. I also chose to use the
shorthand "|" instead of "separator" for brevity. This last change
is the only one made to the edithelp configuration.

[2011.09.20] F. Demians. This patch is compatible with bug 6649 patch,
fixing help pages editing, and so could be applied before or after it.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 3c0883fac7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 12:48:49 -04:00
MJ Ray 2afee7b84a Bug 6460: alternative fix, updating template and script instead of C4::Log
Add some test cases and fix a bug in C4::Log found by in review.
Thanks-to: Katrin Fischer.

Signed-off-by: Liz Rea <lrea@nekls.org>
Passes test, interface works as expected.

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a746e11c14)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 12:47:44 -04:00
Chris Cormack c3a3d3ad24 Bug 6679 : Enable Critic tests for authorities and fixed resulting warnings
Signed-off-by: Ian <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e1bb9e5137)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 12:44:15 -04:00
Robin Sheat 9a11fda019 Bug 6824 - correctly check basket viewing permissions
Previously you couldn't view baskets that you hadn't created, unless you
were superlibrarian due to a bug. Now people with the right permissions
can see the baskets.

Applies to both 3.04.04 and master.

Signed-off-by: Brendan <info@bywatersolutions.com>
Signed-off-by: Melia Meggs <melia@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 9966d218ae)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 12:44:02 -04:00
Chris Cormack 23d97c608c Bug 6755 follow up, fixing broken POD
(cherry picked from commit 8e7b163608)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 12:42:11 -04:00
Alex Arnaud 397476110f Bug 6755 follow up
Use C4::Templates::_get_template_file instead od C4::Output::_get_template_file
in preferences.pl

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d60732119c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 12:41:31 -04:00
Frédéric Demians a8d0be4bcd Bug 6755 Problems with switching languages
This patch solves the situation that news is in another language than
the Koha interface AND makes that themelanguage routine is always called
the same way in order to prevent mixed display.

It fixes also a bug related to language preselection based on web
browser prefered language.

September 9: Adjusted with input of Frederic Demians.

Septembre 10: Avoid circular dependency, as pointed by Chris Cormack.
Templates related functions are moved from C4::Output to C4::Templates

Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 12:21:25 -04:00
Chris Cormack 9310c45e52 Bug 6881 - Not able to accept a suggestion (typo in template)
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Easy fix, works great.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4029e8ed75)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 12:18:52 -04:00
Katrin Fischer cb7988e5f6 Bug 3704: SIP Checkin of not checked out item returns error without reason
Checking in an available item returns an error (which is correct) without
giving a reason for the failure as screen_msg (aka AF field in SIP2 is empty).

Based on code suggested by Patrick Langer <patrick.langer@easycheck.org>

Signed-off-by: Ulrich Kleiber <ulrich.kleiber@bsz-bw.de>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit a2ee6443b9)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 12:17:52 -04:00
Srdjan Jankovic dd48e4392d bug_4831: Use unitprice (actual cost) when totalling spent amounts for "All available funds", as in "Already received"
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

To test:
- add new fund for an active budget
- order item, price 8.00
- check funds page and acq home: committed amount should be 8.00
- receive item, enter actual price 10.00
- check funds page and acq home: spent amount should be 10.00

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4fb88deaa7)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 12:17:52 -04:00
D Ruth Bavousett 593064036e Bug 6900 - line break between available and reference items
This patch adds a conditional line-break in the availability section of XSLT results.

Signed off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 65e65d7c37)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 12:17:51 -04:00
Robin Sheat 3d9fe2cec1 Bug 6360 - add some more sounds to some happenings on returns
This adds an alert sound to various events around transfers and holds
when items are being returned, to make it more apparent that attention
is needed.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6e91a453aa)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 12:17:51 -04:00
Srdjan Jankovic bdb0cf0696 bug_6576: Submit when changing framework rather then reloading
TransformHtmlToMarc(): changed interface - no point passing params when
they can be accessed from $cgi

Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit c453a45f38)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 12:17:50 -04:00
Maxime Pelletier 547246877e Bug 6679 : fix 3 perl::critic warnings
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 6200d4ae21)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 12:17:50 -04:00
Chris Cormack 3ca4d242d0 Bug 6679 Fix scripts in admin & acqui to pass Perl::Critic
Scripts in admin & acqui subdirectores weren't passing t/00-testcritic.t. This
patch add admin & acqui scripts to test case and fix various errors related to
Perl::Critic compliancy.

- Fixing a style error to pass Perl::Critic, plus silencing a warn
- More style errors, plus fixing a security issue
- Explicitly using Carp

Contrary to common belief, subroutine prototypes do not enable
compile-time checks for proper arguments. Don't use them.

Defining a named sub within another sub, does not prevent that
subroutine being global

Signed-off-by: Frédéric Demians <frederic@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7cdea5de35)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 12:16:39 -04:00
Owen Leonard 1fdebcb296 Fix for Bug 6842 - Branch transfer limits broken
- Changing library select form so that chosen library is preselected
- Changing pager <form> to a <p> so that nested form tags don't
  conflict. It was the addition of the javascript table pager
  which broke the functionality on this page.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
- It's possible to select a different library now. The pull down shows
the chosen library correctly.
- I can make changes and save them without any problems.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 377f174b06)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 12:15:20 -04:00
Owen Leonard a8a44a593a Fix for Bug 6766 - Template variable scope errors in holds template
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 06a939178c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 12:15:19 -04:00
Chris Cormack 89fac70d42 Bug 5675 : CheckReserves not honouring item level itemtypes preferences
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>

With item level itypes activated only the item for which holds were
allowed in circulation rules triggered the hold notice on checkin.

Also checked that biblio level itype still trigered correctly.

Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 1a54fc3642)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-10-08 12:15:18 -04:00
Chris Nighswonger c86b79fd60 Updating Version Number to 3.04.05.000 2011-09-26 19:47:59 -04:00
Chris Nighswonger eefed66b1d Release Notes for 3.04.05.000 2011-09-26 19:46:18 -04:00
Frédéric Demians 841cb87a1c Suite trad fr-FR
(cherry picked from commit 001d9606fe03646e54866bb893b687f62cae28d8)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-09-26 15:19:43 -04:00
Frédéric Demians 84f026f770 Bug 6883 Update userpermisions.sql fr-FR file
(cherry picked from commit 44d5c2722ea6910ab4a45fb108631220a55aea08)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-09-26 15:19:30 -04:00
Frédéric Demians 185067fbc3 Mise à jour fr-FR et da-DK
(cherry picked from commit 65c3f1822b45b543d15f94e340b99f3f59e56431)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-09-26 15:19:12 -04:00
Frédéric Demians 75096ebdf2 3.4.5 .po files update at String Freeze
(cherry picked from commit 4cc7756113db3cbf607143cacf7cca50ebd54b1b)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-09-26 15:18:02 -04:00
Srdjan Jankovic d7aa3a4434 bug_6318: Always give predefined fields drop downs on label layout edit
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit d43aa87d35)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-09-15 20:21:17 -04:00
Owen Leonard 4d97f7ee09 Fix for Bug 6458 - incorrect parsing result in translation processing
Fixing improperly nested template logic inside HTML tags in
messaging preferences include.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7cc412d337)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-09-15 20:20:30 -04:00
Owen Leonard 8fc80fcec9 Fix for Bug 6458 - incorrect parsing result in translation processing
Fixing improperly nested template logic inside HTML tags in MARC
editor. Modifying script to stop tag attribute markup from being
passed to the template directly in favor of using template logic.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 7e8381c78c)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-09-15 20:20:30 -04:00
Owen Leonard 2aca7cfd49 Fix for Bug 6458 - incorrect parsing result in translation processing
Correcting doc-head-open.inc (again?).

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 143e3e6541)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-09-15 20:20:29 -04:00
Owen Leonard 1bd17707e8 Fix for Bug 6458 - incorrect parsing result in translation processing
Correction for opac-messaging.tt tops tag attribute markup from
being passed to the template directly in favor of using template
logic.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 4324377c55)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-09-15 20:20:28 -04:00
Katrin Fischer 8411cf6b30 Fix for Bug 6458 Follow-up for memberentrygen.tt
The registration date field would show up twice after applying the first
patch for memberentrygen.tt.

This patch fixes the problem.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 8a4dbae0ef)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-09-14 14:47:04 -04:00
Owen Leonard 593a4d9b06 Fix for Bug 6458 - incorrect parsing result in translation processing
Fixing improperly nested template logic inside HTML tags in
member entry form.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Fixes lots of problems. Spotted one small problem. I am sending a follow-up.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit e8a876614e)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-09-14 14:46:51 -04:00
Nicole C. Engard 3b56a0f8a9 Bug 5252 - Phone labels on patron creation
The labels for emails on the patron forms say 'primary' and
'secondary.' This patch does the same thing for the phones.
phone is now 'Primary phone', mobile is now 'Secondary phone',
and 'phonepro' is now 'Other phone'. This way the type of phone
does not matter and the phone that the patron wants to be called
at the most is the 'primary.'

This is just a step in the direction of fixing Bug 5252, not a
complete fix.

This patch also updated a stray reference to Home Email.  Both the
OPAC and staff client are updated with this patch.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
(cherry picked from commit 0a71367dc2)

Signed-off-by: Chris Nighswonger <chris.nighswonger@gmail.com>
2011-09-14 14:46:11 -04:00