Owen Leonard [Tue, 20 Sep 2011 16:21:34 +0000 (12:21 -0400)]
Fix for Bug 4298 - Title detail display: improve display of item level hold information
Message changed for two cases, waiting and item-level hold:
"Waiting for [ patron name ] at [ library] since [ date ]"
"Item-level hold for [ patron name ] for delivery at [ library ] (placed [ date ])"
Signed-off-by: Liz Rea <lrea@nekls.org>
Works as advertsed, is MUCH more clear.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Sun, 25 Sep 2011 08:23:21 +0000 (21:23 +1300)]
Merge remote-tracking branch 'kc/new/bug_6205' into kcmaster
Robin Sheat [Thu, 22 Sep 2011 03:32:24 +0000 (15:32 +1200)]
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>
Liz Rea [Thu, 22 Sep 2011 18:59:11 +0000 (13:59 -0500)]
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>
Joy Nelson [Fri, 23 Sep 2011 02:36:48 +0000 (22:36 -0400)]
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>
Chris Cormack [Sat, 24 Sep 2011 08:54:42 +0000 (20:54 +1200)]
Fixing a bug in the templates that will break translation
Katrin Fischer [Wed, 21 Sep 2011 20:39:51 +0000 (22:39 +0200)]
Bug 6901: Add classes to XSLT detail view in OPAC
This patch adds css classes to the fields in XSLT OPAC view so
you can use OpacUserCss system preference for formatting
and hiding fields.
The css classes are named like the labels with additional underscores
where necessary.
Example:
.publisher {
display:none;
}
.other_title {
font-weight: bold;
}
Note: Patch also moves some hard-coded CSS from Utils into the CSS file (only
apples for 880 fields)
Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Wed, 21 Sep 2011 19:17:16 +0000 (21:17 +0200)]
Bug 6901: Add classes to XSLT detail view in STAFF
This patch adds css classes to the fields in XSLT intranet views.
Use OpacUserCss and IntranetUserCss system preferences for altering the styling of
and hiding fields.
The css classes are named like the labels with additional underscores
where necessary.
Example:
.publisher {
display:none;
}
.other_title {
font-weight: bold;
}
Note: This patch also fixes the display of additional authors in field 880 (original
scripts like Hebrew). This small additional problem was found as a side effect of testing, where the
existence of an author in 880 would break the XSLT.
Also moves some CSS from a style attribute into the CSS file for 880 fields.
Signed-off-by: Liz Rea <lrea@nekls.org>
-- minor commit message edits (requested by KF)
Owen Leonard [Fri, 16 Sep 2011 14:27:24 +0000 (10:27 -0400)]
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>
Liz Rea [Wed, 14 Sep 2011 19:56:03 +0000 (14:56 -0500)]
Bug 6870 [enh] - allow opac-userupdate.pl to use the patron's email as 'from' address
Patch makes it so that Koha sends patron update emails from the first valid patron email address, instead of from the KohaAdmin or branch email address.
This patch should make it so that libraries can directly reply to patrons regarding patron updates.
To test:
Create a patron with no email address, do a patron update and observe the to: and from: - they should both be the KohaAdminEmail address.
Add an email address to that same patron, and send a patron update. Observe the to: and from: - the from: should be the first valid email address of the patron, to should be the KohaAdminEmail address.
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>
Chris Cormack [Fri, 23 Sep 2011 22:03:08 +0000 (10:03 +1200)]
Merge remote-tracking branch 'kc/new/bug_6460' into kcmaster
MJ Ray [Thu, 22 Sep 2011 18:27:43 +0000 (19:27 +0100)]
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>
Henri-Damien LAURENT [Fri, 5 Aug 2011 18:33:11 +0000 (14:33 -0400)]
Fix for Bug 5436 - Extended patron attributes display improvements
Show patron attributes in the sidebar on circ and patron pages
[Edit from Owen Leonard: This patch takes changes originally in
Bug 5436 and isolates just the parts relating to display of
patron attributes. Because function for pulling patron attributes
was merged with the function for displaying address information
in SetMemberInfosInTemplate() (also found in Bug 5749), I moved
the call to GetBorrowerAttributes into the individual scripts.
That keeps the functionality relating specifically to patron
attributes separate from the proposed changes to displaying
addresses.
Because I think it's important to keep the display consistent,
I added display of patron attributes to all pages which include
the patron information sidebar.]
Rebased for compatability with bug 3489 and database documentation by
Ian Walls, 9-21-11
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Fri, 23 Sep 2011 03:01:21 +0000 (15:01 +1200)]
Merge remote-tracking branch 'kc/new/enh/bug_4877' into kcmaster
Robin Sheat [Thu, 22 Sep 2011 02:36:42 +0000 (14:36 +1200)]
Bug 4877 - note that the create-db (or related) options are required
Also fix the example so that it is there.
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Fri, 23 Sep 2011 02:19:11 +0000 (14:19 +1200)]
Merge remote-tracking branch 'kc/new/bug_6679' into kcmaster
Chris Cormack [Wed, 21 Sep 2011 03:52:23 +0000 (15:52 +1200)]
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>
Robin Sheat [Wed, 31 Aug 2011 03:22:38 +0000 (15:22 +1200)]
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>
Chris Cormack [Thu, 22 Sep 2011 23:34:28 +0000 (11:34 +1200)]
Merge remote-tracking branch 'kc/new/bug_6755' into kcmaster
Chris Cormack [Thu, 22 Sep 2011 23:33:00 +0000 (11:33 +1200)]
Bug 6755 follow up, fixing broken POD
Katrin Fischer [Thu, 22 Sep 2011 21:35:08 +0000 (23:35 +0200)]
Bug 3941: Follow up
Improving the notices field to make it possible
- to expand more than one field at a time
- hide the notice content with another click
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Thu, 22 Sep 2011 19:32:42 +0000 (21:32 +0200)]
Bug 3941 - Combine Notices & Messaging Tabs
Changes to notices tab to make it a full replacement for messages tab.
Removes messages tab from patron account.
- repairs view of patron address in left column (category description, branch)
- shows some explanation, when there are no messages for a borrower
- makes the notice an expandable field, a click on the subject will
expand the field to show the message content
- makes message status and message transport type translatable,
by moving the possible values into the template
- removes the messaging tab from various menus
- removes the files that were associated with the messaging tab
- preserves the line breaks in message content to improve readability
Also fixes Bug 6593 - Some information missing from the "Notices" tab.
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>
Alex Arnaud [Thu, 22 Sep 2011 09:05:13 +0000 (11:05 +0200)]
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>
Frédéric Demians [Thu, 25 Aug 2011 13:01:19 +0000 (15:01 +0200)]
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>
Chris Cormack [Wed, 21 Sep 2011 22:33:34 +0000 (10:33 +1200)]
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>
Owen Leonard [Mon, 22 Aug 2011 15:33:59 +0000 (11:33 -0400)]
Alternate fix for Bug 2534 - Viewing items table on item edit screen requires horizontal scrolling
This patch doesn't eliminate horizontal scrolling, but simplifies
the situation:
- The left-hand sidebar has been moved below the table of items.
- The "overflow:scroll" style has been removed from the table of items.
Having overflow set meant that it was often necessary to scroll twice
to reach data in the table: once using the scrollbars on the table
and again using the page's scrollbars.
The NEKLS catalogers also extend their thanks for this fix.
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>
Katrin Fischer [Fri, 2 Sep 2011 14:21:23 +0000 (16:21 +0200)]
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>
Srdjan Jankovic [Wed, 7 Sep 2011 04:02:21 +0000 (16:02 +1200)]
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>
D Ruth Bavousett [Wed, 21 Sep 2011 15:50:19 +0000 (08:50 -0700)]
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>
Robin Sheat [Tue, 13 Sep 2011 03:50:26 +0000 (15:50 +1200)]
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>
Srdjan Jankovic [Mon, 12 Sep 2011 09:09:49 +0000 (21:09 +1200)]
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>
Maxime Pelletier [Tue, 20 Sep 2011 21:40:36 +0000 (17:40 -0400)]
Bug 6679 : fix 3 perl::critic warnings
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Frédéric Demians [Sat, 17 Sep 2011 06:02:54 +0000 (08:02 +0200)]
Bug 6679 Followup for acqui/histsearch.pl
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Mon, 8 Aug 2011 08:29:05 +0000 (20:29 +1200)]
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>
Ian Walls [Tue, 20 Sep 2011 19:32:14 +0000 (15:32 -0400)]
Enh 6887: Add 'checked out from' column to issued items display tables
Adds "checked out from" column to the right of "checked out on" on both
circ/circulation.pl and members/moremembers.pl. Columns are sortable with tablesort
(though only on circ/circulation.pl if syspref enabled).
The branch name is sourced from issues.branchcode.
EDIT BY Owen Leonard: Adjusting table columns which are sorted by default
to accommodate the new column.
Things look good! Thanks!
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Liz Rea <lrea@nekls.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 15 Sep 2011 14:12:27 +0000 (10:12 -0400)]
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>
Owen Leonard [Tue, 23 Aug 2011 16:18:44 +0000 (12:18 -0400)]
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>
Chris Cormack [Sun, 28 Aug 2011 23:21:24 +0000 (11:21 +1200)]
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>
Chris Cormack [Fri, 16 Sep 2011 01:53:40 +0000 (13:53 +1200)]
Merge remote-tracking branch 'kc/new/enh/bug_4877' into kcmaster
Robin Sheat [Wed, 14 Sep 2011 07:03:58 +0000 (19:03 +1200)]
Bug 4877 [ENH] [SIGNED-OFF] install generated man pages with build process
This uses the docbook source files to generate the man pages, and
installs them to their correct location when the packages are being
built.
This will make it easier for people to write man pages, thereby ensuring
that people join in keeping documentation up to date.
Note: adds docbook-xsl and xsltproc to the dependencies.
Note2: applies on top of Magnus' other patch on this ticket.
Signed-off-by: Magnus Enger <magnus@enger.priv.no>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Magnus Enger [Tue, 13 Sep 2011 06:25:36 +0000 (08:25 +0200)]
Bug 4877 [ENH] Use DocBook for koha-common manual pages
This patch
- deletes debian/scripts/koha-create.8
- adds debian/docs/koha-create.xml and koha-remove.xml
Signed-off-by: Robin Sheat <robin@catalyst.net.nz>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Srdjan Jankovic [Mon, 5 Sep 2011 08:44:14 +0000 (20:44 +1200)]
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>
Chris Cormack [Wed, 14 Sep 2011 20:42:56 +0000 (08:42 +1200)]
Merge remote-tracking branch 'kc/new/bug_6458' into kcmaster
Owen Leonard [Tue, 13 Sep 2011 13:51:01 +0000 (09:51 -0400)]
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>
Owen Leonard [Thu, 1 Sep 2011 15:14:50 +0000 (11:14 -0400)]
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>
Owen Leonard [Tue, 13 Sep 2011 12:57:25 +0000 (08:57 -0400)]
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>
Owen Leonard [Thu, 25 Aug 2011 19:11:09 +0000 (15:11 -0400)]
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>
Marcel de Rooy [Thu, 1 Sep 2011 12:07:40 +0000 (14:07 +0200)]
6829: Remove two warnings for opac-MARCdetail
Remove two warnings from logfile by adding simple checks.
Sept 1, revision: Clearing another warning (thx Owen) too.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Mon, 22 Aug 2011 16:23:05 +0000 (12:23 -0400)]
Fix for Bug 2891, cannot manually enter date at reports/issues_stats.pl
Removed unnecessary readonly attribute from date fields
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Nicole C. Engard [Sat, 6 Aug 2011 11:15:11 +0000 (07:15 -0400)]
bug 6677 - remove reference to 'debarred'
The patron stats wizard had 'debarred' in the pull down
for status, but it's called restricted everywhere else.
This patch changes debarred to restricted.
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Liz Rea [Tue, 6 Sep 2011 18:00:51 +0000 (13:00 -0500)]
Bug 6841 - A member with cataloging permissions cannot change branches (when independent branches is set on)
This patch does a couple of things.
1. Changes permission over all to set branch printer (change branch/Set Library) from "circulation" privileges to "view catalogue" permissions. Reasoning: anyone who has privileges to view catalogue could reasonably be expected to perhaps need to change the set branch, but you might have people who don't have circulate permissions who need to change the branch, centralized cataloguing, for example. Those people would never circ and wouldn't need circ privileges, but *would* need to be able to change the set branch.
2. Changes the template flags to see the "Set Library" link with independent branches set from "manage users" to "manage users or edit catalogue." Reasoning: even with indy branches on, there might be reasons for catalogers to be able to change the set branch (that reason was the impetus for this patch in the first place).
To test:
Create a user with only "View Catalogue" Permissions (no circulate permissions), that user should be able to change set library with Independent branches OFF.
With independent branches on, give a user edit catalogue permissions. That user should be able to change set library.
I want to add that this patch was specifically written in response to chris_n's bug report. It may not be practical for these changes to be in mainline, but I haven't thought of any reasons why it would be explicitly bad. That doesn't mean there aren't some, though.
Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Colin Campbell [Thu, 21 Jul 2011 11:16:22 +0000 (12:16 +0100)]
Bug 6620 Ensure autoflush is set on output filehandles
stdout is by default buffered and a flush is only guaranteed on CR
Sip responses are not CR terminated so we need to ensure autoflush
is switched on so that the filehandle is flushed after a print
Otherwise this can manifest as self checks running slow or
failing due to timeout (although in the log we see the response)
Signed-off-by: Ulrich Kleiber <ulrich.kleiber@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Janusz Kaczmarek [Wed, 18 May 2011 20:35:57 +0000 (22:35 +0200)]
Bug 6368: unimarc_field_4XX plugin does not work with new templates - corrected
[2011.05.19] I confirm the bug and the solution
Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Tue, 13 Sep 2011 22:14:54 +0000 (10:14 +1200)]
Merge remote-tracking branch 'kc/new/bug_6458' into kcmaster
Owen Leonard [Tue, 13 Sep 2011 16:30:05 +0000 (12:30 -0400)]
Follow-up fix for Bug 6458, incorrect parsing result in translation processing
Somehow some markup which should have been deleted by a previous
patch has reappeared, messing up the display of the MARC editor.
This patch removes that section again.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Tue, 13 Sep 2011 13:33:05 +0000 (09:33 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
Fixing improperly nested template logic inside HTML tags in
CSV profiles template
Also fixing improperly scoped template variable which prevented
the current profile from being preselected under the edit tab.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Tue, 13 Sep 2011 13:01:54 +0000 (09:01 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
Fixing improperly nested template logic inside HTML tags in
budgets admin search form.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Fri, 26 Aug 2011 20:07:46 +0000 (16:07 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing / branches
Correction for branch admin template stops tag attribute markup from
being passed to the template directly in favor of using template
logic.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Fri, 26 Aug 2011 19:56:00 +0000 (15:56 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing / clone-rules
Fixing improperly nested template logic inside HTML tags in
clone circulation rules form.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Fri, 2 Sep 2011 14:14:51 +0000 (10:14 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
There is template logic in manage-marc-import.tt which is intended
to set the "selected" option for the framework chooser ("Add new
bibliographic records into this framework"). However, I can't see
any place in the code which sends the "selected" variable to the
template, and I can't see any circumstance in which a value would
be passed to the template.
This patch removes the "selected" variable from the template.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 25 Aug 2011 19:37:25 +0000 (15:37 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
Correction in opac holds template. Corrections made are logically
consistent, but I couldn't reproduce the combination of factors
to trigger the "disabled" attribute on the branch selector. In
that respect this hasn't been tested 100%.
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Fri, 26 Aug 2011 14:54:07 +0000 (10:54 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing / patron-attr-types
Correction for patron-attr-types.tt stops tag attribute markup from
being passed to the template directly in favor of using template
logic.
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Read the patch and tested the page, didn't find any problems.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Wed, 11 Aug 2010 00:27:39 +0000 (02:27 +0200)]
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>
Owen Leonard [Fri, 26 Aug 2011 13:07:15 +0000 (09:07 -0400)]
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>
Owen Leonard [Thu, 1 Sep 2011 14:53:24 +0000 (10:53 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
Fixing improperly nested template logic inside HTML tags in the
system preferences editor.
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 1 Sep 2011 14:36:50 +0000 (10:36 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
Fixing improperly nested template logic inside HTML tags in spine
label print template.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 1 Sep 2011 14:26:19 +0000 (10:26 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
Fixing improperly nested template logic inside HTML tags in member
details template.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 1 Sep 2011 14:06:03 +0000 (10:06 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
Fixing improperly nested template logic inside HTML tags in
aqplan template.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Thu, 1 Sep 2011 13:40:08 +0000 (09:40 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
Fixing improperly nested template logic inside markup in header.inc
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Fri, 26 Aug 2011 20:15:34 +0000 (16:15 -0400)]
Fix for Bug 6458 - incorrect parsing result in translation processing
Fixing improperly nested template logic inside HTML tags in
branch transfer limits template.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Tue, 13 Sep 2011 20:46:05 +0000 (08:46 +1200)]
Merge remote-tracking branch 'kc/new/bug_5234' into kcmaster
Owen Leonard [Tue, 21 Sep 2010 12:35:38 +0000 (08:35 -0400)]
Fix for Bug 5234 - Remove unused CSS files
Chris Cormack [Tue, 13 Sep 2011 02:34:01 +0000 (14:34 +1200)]
Merge remote-tracking branch 'kc/new/enh/bug_6716' into kcmaster
Chris Cormack [Tue, 13 Sep 2011 02:33:15 +0000 (14:33 +1200)]
Bug 6716 couple of little typos
Robin Sheat [Sun, 31 Jul 2011 02:26:23 +0000 (14:26 +1200)]
Bug 6651 - fix splitting of names when updating to 3.4
This affects only koha package installations that have multiple
instances running. After this patch, it's worth running the upgrade
again to ensure that everything happened correctly the first time.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Owen Leonard [Mon, 18 Jul 2011 18:36:05 +0000 (14:36 -0400)]
Fix for Bug 6609, Clean up guided reports dictionary entry process
Some general interface cleanup tasks with the guided reports dictionary entry
process:
- Improving the breadcrumb links
- Eliminating the tabs in favor of more descriptive <legend> labels
- Clarifying some labels
- Correcting form markup according to established patterns
(Undertaken primarily because the tabs translated poorly when trying to
re-implement them for Bug 5481, Replace YUI JS libraries with Jquery UI)
Signed-off-by: Nicole Engard <nengard@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Mon, 12 Sep 2011 21:36:13 +0000 (09:36 +1200)]
Merge remote-tracking branch 'kc/new/bug_6458' into kcmaster
Katrin Fischer [Wed, 24 Aug 2011 22:40:56 +0000 (00:40 +0200)]
Bug 6458: Incorrect translation processing / results
Removed template toolkit directives from within HTML tags.
Advanced Search > Scan Index > Search results
Additional changes:
- removes entry 'Series Title' from the index pull down as it was the same
index as 'Series'
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Wed, 24 Aug 2011 22:09:11 +0000 (00:09 +0200)]
Bug 6458: Incorrect translation processing / suggestion
Removes template toolkit directives from within HTML tags.
Acquisitions > Suggestions
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Sat, 20 Aug 2011 17:02:01 +0000 (19:02 +0200)]
Bug 6458: Incorrect translation processing / sco-main.tt
Patch removes templates directives from HTML tags in sco-main.tt
Problems were related to buttons for renewing items.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Before
opac-tmpl/prog/en/modules/sco/sco-main.tt: 135, 222
After, no errors
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Wed, 24 Aug 2011 18:49:23 +0000 (20:49 +0200)]
Bug 6458: Incorrect translation processing / serials/...
Fixes problems with template toolkit directives within HTML tags
for the serials module.
Serials > add/modify subsciption
serial-issues-full.tt seems to be unused?
I couldn't find the page in the serials module.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Wed, 24 Aug 2011 17:43:58 +0000 (19:43 +0200)]
Bug 6458: Incorrect translation processing - rotating_collections/...
Patch removes templates directives from HTML tags in the
rotating collections module.
The module is currently not interated into Koha's staff interface.
Fixing templats to make Jenkins happy.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Thu, 25 Aug 2011 16:48:55 +0000 (12:48 -0400)]
Bug 6458: Incorrect translation processing / opac-detail.tt
Patch removes template directives from within HTML tags from OPAC detail view.
Problems were related to the items tabs for holdings, subscriptions, and serial collection.
Fixed the problem spotted by Frère Sébastien Marie - thx!
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Mon, 22 Aug 2011 22:06:00 +0000 (00:06 +0200)]
Bug 6458: Incorrect translation processing / cataloguing/...
Patch removes template directives from within HTML tags from
- cataloging > new record
- cataloging
- UNIMARC plugin for 4XX
There is one problem remaining in addbiblio:
<option value="[% frameworkcodeloo.value %]" [% frameworkcodeloo.selected %]>
[% frameworkcodeloo.frameworktext %]
</option>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Mon, 22 Aug 2011 21:47:02 +0000 (23:47 +0200)]
Bug 6458: Incorrect translation processing / acqui/...
Patch removes template directives from within HTML tags from
- acquisitions > new vendor / modify vendor / vendor details
- acquisitions > late orders
- acquisitons > vendor x > basket groups
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Sat, 20 Aug 2011 17:38:30 +0000 (19:38 +0200)]
Bug 6458: Incorrect translation processing - masthead.inc
Patch removes templates directives from HTML tags in masthead.inc
Problem was related to library pull down shown when
OpacAddMastheadLibraryPulldown is activated.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Before
opac-tmpl/prog/en/includes/masthead.inc: 83
After no errors
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Mon, 22 Aug 2011 21:25:37 +0000 (23:25 +0200)]
Bug 6458: Incorrect translation processing / 3x reports/...
Patch removes template directives from within HTML tags from
- Reports > Guided Reports
- Reports > Items with no checkouts
- Reports > Patron statistics
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Mon, 22 Aug 2011 21:16:12 +0000 (23:16 +0200)]
Bug 6458: Incorrect translation processing / authorities.tt
Patch removes template directives from within HTML tags from
authorities > modify authority.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Mon, 22 Aug 2011 21:00:18 +0000 (23:00 +0200)]
Bug 6458: Incorrect translation processing / review.tt
Patch removes template directives from within HTML tags from
Tools > Tags.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Mon, 22 Aug 2011 20:46:28 +0000 (22:46 +0200)]
Bug 6458: Incorrect translation processing / overdue.tt
Patch removes template directives from within HTML tags from
circulation > overdues.
Problems were related to patron flags pull down and sort by loop for patron attributes.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Katrin Fischer [Sun, 21 Aug 2011 17:58:48 +0000 (19:58 +0200)]
Bug 6458: Incorrect translation processing - doc-head-close/open.inc
Patch removes templates directives from HTML tags in masthead.inc
Fixes all 3 problems now.
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Chris Cormack [Mon, 12 Sep 2011 21:08:50 +0000 (09:08 +1200)]
Merge remote-tracking branch 'kc/new/enh/bug_6716' into kcmaster
Nicole C. Engard [Thu, 8 Sep 2011 01:47:48 +0000 (21:47 -0400)]
Bug 6716: Document suggestions DB table
This patch documents the suggestions database table. Several fields
appear to be unused:
* volumedesc
* publicationyear
* mailoverseeing
They are left undocumented by this patch.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Nicole C. Engard [Sat, 27 Aug 2011 05:43:10 +0000 (01:43 -0400)]
Bug 6716 - Define reports_dictionary table
This patch documents the reports_dictionary table.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Nicole C. Engard [Sat, 27 Aug 2011 05:08:25 +0000 (01:08 -0400)]
Bug 6716 - Document holiday tables
This patch documents the special_holidays and repeatable_holidays
tables.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Nicole C. Engard [Sat, 27 Aug 2011 04:30:15 +0000 (00:30 -0400)]
Bug 6716 - Document subscriptionroutinglist table
This table holds information related to serials routing lists.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Nicole C. Engard [Sat, 27 Aug 2011 04:14:49 +0000 (00:14 -0400)]
Bug 6716 - Documents the virtual shelves tables
This patch documents the virtualshelfcontents and virtualshelves
tables. In the virtualshelfcontents table the 'flags' field has
been left undocumented since there is no data stored in this
field.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Nicole C. Engard [Sat, 27 Aug 2011 03:49:25 +0000 (23:49 -0400)]
Bug 6716 - Document z3950servers table
This patch documents the z3950servers table in Koha. There are two
fields marked as unused (icon and description) and two fields that
were left undocumented because they contain data, but I am unsure
of where the data is coming from (position and type). A follow up
patch will be necessary to document these fields.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Nicole C. Engard [Sat, 27 Aug 2011 03:23:09 +0000 (23:23 -0400)]
Bug 6716 - Documentation for the messages table
This documents the messages table which stores info about the
circulation messages.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Nicole C. Engard [Fri, 26 Aug 2011 23:30:45 +0000 (19:30 -0400)]
Bug 6716 - Documentation for the fieldmapping table
This patch documents the fieldmapping table which contains the data
associated with the Keyword to Marc Mapping administration area.
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>