Commit graph

152 commits

Author SHA1 Message Date
Marc Véron
437489347c Bug 4231 - Placing holds from cart fails silently
This patch adds a more meaningfull message if multiple biblios with no
items attached are in the cart.

To test:
- Add biblios with and without items to cart
- Go to cart, select all and click 'Place hold'

Without patch, message reads:
Cannot place hold: this record has no items attached.

With patch, message reads:
Cannot place hold: one or more records without items attached.

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

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
Trivial string fix. Message is better than before.
2014-08-15 15:33:01 -03:00
Pasi Kallinen
9e9088049c Bug 12138 - Use placeholders in translatable Javascript strings
Currently translating Javascript strings with variables in them is hard,
because the strings are created from separate parts. For example:

 _("Are you sure you want to delete the") + " " + count + " " +
_("attached items?")

This is translated in two different parts, and the translator cannot
affect the place where the count-variable is.

Now, if the javascript strings allowed placeholders, similar to how the
template strings do, the above could be written as:

_("Are you sure you want to delete the %s attached
items?").format(count)

This would make translation much easier.

Attached patch adds a Javascript string formatter, and changes all the
concatenated translatable JS strings used in intranet to use that.

To test:
1) cd misc/translator
2) perl translate update xx-YY
3) grep ^msgid po/xx-YY-i-staff-t-prog-v-3006000.po | sort | uniq >
xx-YY-pre
4) apply patch
5) perl translate update xx-YY
6) grep ^msgid po/xx-YY-i-staff-t-prog-v-3006000.po | sort | uniq >
xx-YY-post
7) compare the files: diff -Nurd xx-YY-pre xx-yy-post | less
   should show the javascript strings that changed.
8) Test the UIs where the formatted js strings are used.

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

I tested *most* of the changed files. There were some instances where it
wasn't clear to me how to trigger the warnings which were modified,
especially tags/review.tt, admin/manage-marc-import.tt, and holidays.tt.
Everything I was able to test worked correctly.

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

Works nicely, no regressions found. Thx!

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-04-27 21:24:04 +00:00
aa722ab694 Bug 11570 - Upgrade jQueryUI to latest version in the staff client
This patch upgrades the version of jQueryUI included in the Koha staff
client from v1.8.23 to v.1.10.4. The upgrade introduces a few minor API
changes which require the updates in this patch:

- In CSS, the term "active" is used instead of "selected"
- Autocomplete functions use slightly changed parameters

Changes to the default jQueryUI CSS allows us to remove some instances
of "!important" from jQueryUI-related CSS in the staff client's main CSS
file.

To test:

Testing changes to autocomplete:

- Enable the CircAutocompl system preference. Try searching in the
  header's "Check out" tab. Autocomplete should look correct and
  function correctly.

- In Circulation -> Overdues: The patron attribute authorized value
  filter (must have patron attributes enabled, and a patron attribute
  defined which uses authorized values.

- Course reserves -> Course -> Edit: Searching for an instructor

- In the unimarc_field_210c_bis.pl plugin:
  1. Link the publisher name field in your MARC structure to
     the unimarc_field_210c_bis.pl plugin.
  2. Open a MARC record for editing and click the "tag editor" link to
     launch the plugin.
  3. Type the first few letters of a publisher which exists in your
     database. You should get an autocomplete menu of publishers
     which match your search.
  4. Select one and click the "choose" button to fill the field in the
     MARC editor.

- Tools -> Patron lists: Add a list or choose an existing list and add
  patrons. Perform a search for a patron.

- Placing a hold: After choose a title and clicking "Place hold,"
  search for a patron.

- Tags management: The sidebar filter for "reviewer" should let you
  search by patron name.

Other jQueryUI widget changes:

- Check tabs appearance in header search, biblio detail, cataloging, and
  circulation patron fines pages.

To confirm other jQueryUI widgets still function correctly:

- Check accordion (collapsing sections) in Patrons -> Patrons requesting
  modifications and the MARC subfield structure edit screen.

- Check datepickers, especially in Circulation with the added timepicker.
  Test a linked datepicker, for example in Reports -> Stats wizards ->
  Circulation where the value in one date field affects what dates are
  available in the matching field.

- Check the calendar interface in Tools -> Calendar

To confirm that the new jQueryUI default CSS is more flexible (fixing
Bug 11042), add the following CSS to your IntranetUserCSS system
preference and confirm that the header search active tab border color
changes (hash mark escaped so that it will appear in commit msg):

\#header_search ul.ui-tabs-nav li.ui-tabs-active {
  background-color: #FFFFF1;
  border: 1px solid #800000;
  border-top: 0 !important;
  top: -2px;
}

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-04-07 15:37:27 +00:00
Bernardo Gonzalez Kriegel
5da480b61b Bug 11993: fix untranslatable confirm popup in request.tt
This patch makes confirm popup text translatable. It implements a
similar function as used on OPAC deleteConfirm() and a JS var message.

This function, or variants, can also be found on other files on intranet,
I think that the only valid places are staff-global.js and help-top.inc

Redefinitions of this function:
prog/en/modules/serials/subscription-frequencies.tt:6
prog/en/modules/tools/marc_modification_templates.tt:158
prog/en/modules/virtualshelves/shelves.tt:92

Last case is a little different

To test:

1) Confirm that the "cancel hold" link correctly prompts for
   confirmation:
   a) Place an item-level hold on a title.
   b) Check in the item and confirm the hold.
   c) Return to the place hold screen for that title and submit another
      patron to place a hold for.
   d) On the place hold screen for that patron, look at the table of
      items. There should be a "cancel hold" link next to the item for
      which the hold was confirmed in step (b).
   e) Click "cancel hold."  You should see a confirmation message.
      Cancelling this dialog should cancel the operation. Confirming it
      should cancel the hold.

2) Check the string is not present on staff PO file
3) Apply the patch
4) Update translation files (cd misc/translator; perl translate update
   xx-YY)
5) Verify the string is now present

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-04-03 15:27:18 +00:00
Galen Charlton
7378d48841 Bug 12000: ensure that hold resumption dates can be set only to future dates
This patch makes the datepickers for the hold resumption date
(AKA the hold suspend until date) field only permit dates in
the future to be selected in the staff interface checkout page
and hold list pages.  This makes these pages consistent with
the OPAC and the patron details page in the staff interface.

To test:

[1] Ensure that AutoResumeSuspendedHolds and SuspendHoldsIntranet
    are enabled.
[2] Go to the checkout page for a patron that has at least one hold
    request.
[3] Verify that the datepicker for the hold suspend until
    date field only permits choosing a date in the future.
[4] Go to the page listing hold requests for a title.
[5] Verify that the datepicker for the hold suspend until
    date fields only permit choosing a date in the future.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Works as described, passes all tests and QA script.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-03-31 14:26:55 +00:00
0b5b8cef34 Bug 11832: fix JavaScript error on staff client place hold screen if record has no items
If a hold operation is blocked because the title has no items attached
the patron search autocomplete JavaScript triggers an error. This patch
modifies the template so that the JS is loaded only when items are
present.

To test, find a title which has no items attached. View the holds page
for that title. There should be no JavaScript error. Patron search
autocomplete should still work correctly for titles which have items
attached.

Deleted all items from a biblio record. Clicked the holds tab and
confirmed using firebug Javascript error occurs. Applied patch,
confirmed that the Javascript error described in comment 1 no
longer happens. Went to another biblio with items, and confirmed
patron auto-complete still functions.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-03-12 14:52:18 +00:00
3273f82350 Bug 11648 - Use word item instead of copy - intranet
Sometimes, the word copy/copies is use to speak about item/items.
It would be better to use only item because translation of the word
copy depends on context, it should be used only when speaking about
copy like in "copy and paste".

This patch replaces copy/copies in intranet.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
String changes, no regressions found.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-03-12 14:21:15 +00:00
0f9ec8f589 Bug 11649 - Always use words "copy number" - intranet
In most cases, the value of items.copynumber is displayed using the
words "Copy number". But in some cases, it is just "Copy".
It would be better to always use "Copy number" because in translation
the word "Copy" means the action of coping.

This patch manages templates of intranet.

To test, display an item containing a value in items.copynumber.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-02-18 23:51:24 +00:00
Jonathan Druart
38edd714c5 Bug 9788: QA followup
1/ CURRENT_DATE() is a MySQLism and should be replaced with CAST(now() AS
DATE).
2/ The date formatting should be done in the template (using the TT
plugin).

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-01-17 05:10:42 +00:00
a5c762d491 Bug 11503: fix several typos
This patch corrects several typos: Some reported in Bug 11503, others
found during a systematic spell check of the help files.

To test, examine the changes and confirm that the spelling changes are
correct.

Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-01-13 20:47:03 +00:00
Katrin Fischer
5cfa865aad Bug 11336: (follow-up) fixing capitalization in templates
Fixes capitalization on the holds and check in page.

Changes are easy to spot using:
git diff HEAD^ --color-words=.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2014-01-04 22:44:37 +00:00
e276bea3ee Bug 10917: allow staff to update hold pickup location without modify_holds_priority
A librarian cannot modify a hold's pickup location unless he or she has
the permission modify_holds_priority. This appears to be a bug and not
by design. The reason the update fails is due to the priority not being
passed to ModReserve. The priority is not displayed when a librarian
does not have the modify_holds_priority permission.

Test Plan:
1) Remove the modify_holds_priority from your logged in user
   * User cannot be a superlibrarian
2) Attempt to change the pickup location for a hold
3) Note the change fails
4) Apply this patch
5) Repeat step 2
6) Note the change succeeds

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Template change only.
Passes all tests and QA script.

Tested:
- Confirmed that changing the pickup location is not
  possible in master without the modify_holds_priority
  permission
- Confirmed that the patch fixes the problem - pickup
  location can now be changed with and without the
  permission
- Pickup location can still not be changed, when
  IndependentBranches is activated

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-10-08 14:23:07 +00:00
Fridolyn SOMERS
4f263b3a90 Bug 10247: show warning if hold blocked due to maxreserves syspre
On intranet, when placing a hold requst:
If borrower has reached the request limit, a warning should appear :
  Cannot place hold
  * Too Many Holds: TEST has too many holds.

This works when quota defined in circulation rules is reached but not
when limit specified in syspref maxreserves is reached, in case this
limit is lower than the one defined is circulation rules.

This is because template param maxreserves is set twice, this patch
corrects this bug.

Also moves warnings and messages conditional variable from Perl to
template because it cause the same bug as for maxreserves.

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-08-12 15:02:57 +00:00
53fbfa2dde Bug 9394: Use reserve_id where possible
This patch switches from using a combination of
biblionumber/borrowernumber to using reserve_id where possible.

Test Plan:
1) Apply patch
2) Run t/db_dependent/Holds.t

Signed-off-by: Maxime Pelletier <maxime.pelletier@libeo.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-07-24 05:04:55 +00:00
dc94a9bef7 Bug 10464: Patron search on placing a hold now supports autocomplete
The patron search box for placing a hold request on a bib in the
staff interface now supports autocomplete if the CircAutocompl
system preference is enabled.

This patch grabs the autocomplete handling javascript stuff from patron-search-box.inc
and puts an adjusted version on reserve/request.tt.  It sets form and input
IDs to match those configured in the autocomplete call, adjusted where needed to
avoid name collisions with the patron-search-box.inc that is present everywhere.

This patch also doubles the width of the patron search input field.

To test:
- On a biblio record, go to the Holds tab, mine looks like
  /cgi-bin/koha/reserve/request.pl?biblionumber=2
- A search box is shown for patron searching.
- Search for a patron: it works as usual.
- Make sure CircAutocompl is "Don't try"
- Apply the patch
- Click the Holds tab again, and do the same search: functionality should remain intact.
- Change CircAutocompl to "Try"
- Click the Holds tab again
- Autocomplete should show you the possible options, and once you choose one result,
  it should work as usual.

Sponsored-by: Universidad Nacional de Córdoba
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Passes all tests and QA script.
Adding a nice new autocomplete feature.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-06-16 18:38:30 -07:00
Colin Campbell
7668e19c95 Bug 766: remove CGI::scrolling_list from request.pl
Let the template take care of generating the display.
Lets at least part of request.pl be more succinct.

To test, place a hold and search for the patron using a partial name.
You should get a dropdown select list of patrons and be able to select
the patron to hold for from there.

The functionality should remain unimpaired after this patch is applied.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
2013-06-05 07:31:06 -07:00
Bernardo Gonzalez Kriegel
2d9f5fc69e Bug 9457: [ENH] Ordering branches should be case independent (2)
This patch replace use of CGI::scroll_list() to show list of branches.

In two files, marc21_linking_section.pl and unimarc_field_4XX.pl,
the scrolling list is created but not used in the template file,
so the code is removed.

Also minor renaming/normalizing of variables.

To test:
1) Install with some branches, records and patrons

2.1) Select a record, click 'Place hold', select user,
     there is a library pull-down next to 'Pickup at:',
     list is ordered case sensitive
2.2) Go to Reports > Average loan time,
     next to Library is a pull-down,
     list without order
2.3) Go to Reports > Catalog by item type,
     next to 'Select a library' is a pull-down,
     list is ordered case sensitive
2.4) This is tricky, go to Reports home,
     change last part of URL 'reports-home.pl' with
     'manager.pl?report_name=issues_by_borrower_category'
     (can't find a direct link), next to 'Select a library'
     is a library pull-down,
     list without order
2.5) Edit/Add a patron, on section 'Library management'
     there is a library pull-down, case sensitive
2.6) OPAC, as logged user, make a suggestion or hold,
     there is library pull-down, correct order

3) Apply the patch

4.1) Repeat 2.1), correctly ordered list
4.2) Repeat 2.2), correctly ordered list
4.3) Repeat 2.3), correctly ordered list
4.4) Repeat 2.4), correctly ordered list
4.5) This is a bit more work
     There are 3 possible situations to test:
     A) No branches, must show a message that are no
        libraries defined
     B) New patron, must show a correctly ordered
        list of branches, current branch selected
     C) Edit patron, must show a correctly ordered
        list of branches, patron branch selected
4.6) Small changes on variable names, so retest 2.6)

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-03-20 15:35:58 -04:00
Fridolyn SOMERS
714075d5c1 Bug 8942: Translation process breaks javascript
Signed-off-by: Owen Leonard <oleonard@myacpl.org>

I tested most scripts affected by this patch and visually verified
all changes. Functionality is unaffected.
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2013-01-31 11:00:24 -05:00
Vitor FERNANDES
63f2ceb603 Bug 9206 - Only allow place holds in records that the patron don't have in his possession
Added a system preference to turn on/off this feature.
By default the system allow the patron to place holds even if it is in his possession.
Script to place holds check if the system preference is off and if patron has at least one item to block holds.
Messages to say that are already in patron possession added to templates.
Method to check if patron has one issue from one record added to C4::Circulation

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
2012-12-27 09:48:03 -05:00
2b74492d7d Bug 8181 [REVISED] Replace DynArch calendar widget with jQueryUI version
All instances of the old DynArch calendar have been replaced with
jQueryUI versions and the old library files have been removed.

calendar.inc has been modified to include jQueryUI localization
strings and global configuration options. Just add a "datepicker"
class to an input field to trigger a datepicker prompt.

If you would like two fields in one from to limit each other (one
is date from, one is date to), add these classes to each:
"datepickerfrom" and "datepickerto." This will prevent an invalid
entry, e.g. a date in the latter which falls before the former.

jQueryUI is now upgraded to the latest verision, 1.8.21.

Edit: Now with proper translatability, date formatting, first day
of the week handling, and RTL support.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
Signed-off-by: Ian Walls <koha.sekjal@gmail.com>
QA Comment:  rebased on current master; minor merge conflicts with other patches pushed

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-06-25 18:26:26 +02:00
5e43e2f93d Bug 7951 - Suspending holds needs a system preference
Adds system preferences SuspendHoldsIntranet and SuspendHoldsOpac.

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
2012-06-09 18:45:57 +02:00
b04899bafd Bug 7641 - Followup - Suspend Until not set on by suspend button.
For request.pl, there are two ways to suspend a reserve, either
by using the 'suspend' button for an individual reserve, or by
using the 'Update hold(s)' button with suspend until dates set.

If the 'suspend' button is used, any date in the 'suspend until'
field is ignored. This commit fixes this issue.

  * Add suspend_until date to suspend button link via jquery
  * Add optional date to ToggleSuspend()
  * Add KohaDates plugin where necessary

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
passes tests, tested:
* suspend all holds from circ.pl
* suspend one hold from circ.pl
* suspend all holds from moremember.pl
* suspend one hold from moremember.pl
   --- NOTE: clicking suspend all holds without setting a date will mean the holds must be manually unsuspended. I'm not sure this is intentional?
* suspend a specific hold using the in-table button on reserves
* suspend a specific hold using the "update hold" button

500 error is gone.

http://bugs.koha-community.org/show_bug.cgi?id=8084
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-15 15:48:12 +02:00
d1e3773e3b Bug 5184 - Upgrade jQuery to the latest version (staff client)
Upgrade jQuery in the staff client. Besides the change
to the jQuery file syntax has been changed wherever this
syntax was written:

$(foo).attr("checked","");

The new correct way to un-check a checkbox:

$(foo).removeAttr("checked");

I also removed some JavaScript altogether from
branch-transfer-limits.tt which used the old syntax but
which wasn't used on the page at all anymore.

Signed-off-by: Chris Nighswonger <cnighswonger@foundations.edu>
Signed-off-by: Mason James <mtj@kohaaloha.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-05-11 11:05:19 +02:00
Katrin Fischer
12e4651746 Bug 2780 - Capitalize strings consistently (reserve, review, rotating collections)
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
2012-04-10 10:04:13 +02:00
f446b3d03d Bug 7641: Suspend Reserves
Adds the ability to suspend reserves. The new system preference
AutoResumeSuspendedHolds enables the ability to set a date for
a suspended hold to automatically be resumed.

When a hold is suspended, it will continue to increase in priority
as the holds above it are fulfilled. If the first holds in line
to be filled are suspended, the first non-suspened hold in line
will be used when an item can fulfill a hold that has been placed.

http://bugs.koha-community.org/show_bug.cgi?id=7641
Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>

Tested with the preference on and off:
1. placed several holds in the staff client
2. suspended some with a date
3. suspended some without a date
4. triggered hold message by checking in for hold with suspensions
5. the suspended hold was skipped as it should be
6. tested suspending holds in the OPAC w and w/out dates
7. ran the cron to clear suspensions with dates

All the above tests worked as expected. Signing off.
2012-03-29 14:37:49 +02:00
Katrin Fischer
e4c67372e4 Bug 7760 - Add ids and classes to every staff page to help with customization (reports, ...)
This is the last one - adding the classes and ids to the report module and
some template files for smaller moduls/functions.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-22 18:12:35 +01:00
bdd8eb5a81 Bug 7656 - "undefined" pop-up message when putting hold on reference item
This is a single line fix. Initializing the msg var to an empty
string solves the problem.

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
2012-03-16 12:10:40 +01:00
a64ca0a8cf Bug 4054 - Double-clicking the 'place hold' button can result in duplicate holds
This commit adds a new jquery function to staff-global.js, preventDoubleFormSubmit().
When used thusly: $('#form-id').preventDoubleFormSubmit();
It will prevent a submitted form from being submitted a second time.
It is currently only added to the Place Hold form in reserve/request.pl

http://bugs.koha-community.org/show_bug.cgi?id=4045
Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Tested:
Double clicking no longer causes identical double holds to be placed.
passes prove t xt t/db_dependent in line with current master.

Reminder: this will need to be added to the OPAC as well.
2012-02-17 19:22:49 +01:00
Srdjan Jankovic
8b65b94636 Bug 6405: added enumchron to reserve copy list
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-10-09 20:01:24 +13:00
06a939178c 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>
2011-09-21 09:25:08 +12:00
Robin Sheat
218a35776e Bug 6526 - make the reserves code use the borrowernumber
Previously it used the cardnumber, which caused numerous issues if your
users don't have card numbers.

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-06-26 06:44:14 +12:00
3e69eb7cdd Fix for Bug 6332, Hold forms missing 'clear date' link
Signed-off-by: Ian Walls <ian.walls@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-05-29 13:43:18 +12:00
55984a1610 Fix for Bug 6192 - Path to theme directory scoped incorrectly
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-15 10:32:43 +12:00
Jared Camins-Esakov
66fb80f436 Bug 6158: Permissions scoped wrong for T::T
Permission flags should always have absolute scope.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-04-12 09:16:27 +12:00
Chris Cormack
5884fb1000 Bug 5917 : Swapping templates over 2011-04-10 20:38:30 +12:00
Ian Walls
48ee1dcb3f Bug 5547: Hide Lost Items dev
Adds a Hide Lost Items option to the staff client, as detailed in the enhancement request
at http://wiki.koha-community.org/wiki/Hidelostitems_option_for_the_staff_client_RFC

Minor edits: Whitespace

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-03-30 20:20:05 +13:00
ruth@bywatersolutions.com
0b961c0ae0 Bug 5805: Having items in-transit can cause derangement of the hold list
If you have a list of holds on a biblio, and one or more are in-transit, then the
array that is fed to modrequest.pl is not fully-populated, lacking the branch on the
in-transit rows.  If you then attempt to edit one of the remaining holds' pickup
location, it doesn't modify the one you expect, but ones *above* that.  Also, holds
at the bottom of the list get the first pickup library in the list, since they are
getting undef passed in.

Signed-off-by: Nicole C. Engard <nengard@bywatersolutions.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-26 20:44:01 +13:00
Reed Wade
1f0e0c5de1 Bug 5741 - Extra comma causes JavaScript error in Internet Explorer
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2011-02-20 20:29:07 +13:00
Christopher Hall
c02e4d02d5 Bug 5462: fixed dashes (replaced with _) and fullstops (removed) for variable names
Done within opac and intranet templates, still needs to be done for corresponding scripts.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>
2011-02-03 09:54:50 +00:00
0560aa768c bug 5398: make additional pages in staff interface obey noItemTypeImages
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-12-16 08:49:48 +13:00
fbbab73492 Fix for Bug 5214 - undefined itype images cause broken image icon in request.pl
Also fixes the same bug on the Itemtypes administration page.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
2010-11-08 15:30:17 +13:00
Bernardo Gonzalez Kriegel
444fade020 Bug 5122 - Misspelled word: transfered
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-10-17 13:51:32 -04:00
39c177e3f2 bug 3344: display in-transit status on holds priority list
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-24 07:55:35 -04:00
a9c90b6dfb Fix for Bug 4532, Use include file for bibliodefaultview logic
Note that this new include builds only the first half of the
anchor tag (<a>). Because title and subtitle are output differently
on some pages, rendering of the second half of the tag is left
to individual pages.

Includes fixes for staff client templates.

Change to basket.pl fixes a bug wherein the OPAC's bibliodefaultview
preference was being checked instead of the staff client's.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-23 22:54:54 -04:00
Katrin Fischer
a18bdb0bfe BUG 4883: Staff - remove \n from strings for translation
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-06-19 08:09:09 -04:00
fdd2879988 Revert "(bug #3798) fix changing request branch"
This reverts commit ad01b57bcc.

This commit had introduced bug 4526.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-05-24 11:00:41 -04:00
Nahuel ANGELINETTI
ad01b57bcc (bug #3798) fix changing request branch
a variable was wrong in template.

Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-04-30 05:54:04 -04:00
ab54b07ad6 bug 2970: extend new hold priority change permission
Now covers the new hold request priority buttons.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-19 05:23:42 -05:00
e31b7bd9a5 Fix for Bug 2970, Create a permission for modifying holds priority
Adding two new granular permissions under 'reserveforothers,' place_holds
and modify_holds_priority. If a user does not have modify_holds_priority
permission, the option to change the priority of a hold is hidden.
Revised patch includes changes to mandatory data files including
properly translated fr-FR version.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-19 05:12:58 -05:00
57869cb439 bug 1532: fix XHTML validation errors
Also changed some titles to use "hold" instead of "reserve"
for display purposes.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 22:49:48 -05:00
Kyle M Hall
3502810346 (bug 1532) Reserves Updates Ported From Dev_Week
This is a much improved re-implementation of the reserves updates from dev_week.
Less new code has been added, and more existing functions are used instead of adding new ones.

The 'Lock Hold' function has been removed due to it not working as intended.

[RM note for documentation: this adds the following features:

* ability to specify an expiration date for a hold request
  when placing it via the staff interface or OPAC
* daily batch job to cancel expired holds
* nice interface to change the priority of hold
  requests for a bib in the staff interface]

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-18 22:49:47 -05:00
2ce51846a0 More fixes for Bug 2600, HTML tags in titles not escaped in many places
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-03 16:52:31 -05:00
0de7b06267 Fixes for Bug 2600, HTML tags in titles not escaped in many places
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2010-02-03 16:52:27 -05:00
6970d3c1ae Follow-up for Bug 3524, adding itemtype text description
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-09-12 09:12:24 -04:00
Chris Cormack
634df1c76c Bug 3539, Adding a systempreference to hide borrowers name on the catalogue detail page, and holds page
Squashed commit of the following:

commit e9dd6e1dee03fe3503f7995b57510f9edfe6b333
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Wed Aug 19 08:14:53 2009 +0000

    Version number

commit df3ee5473e79b760a91c62b96d7ce19229e0fd27
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Wed Aug 19 08:08:11 2009 +0000

    French systempref

commit c4b036e4e43947d7d1fb9f2e18e460788cb4e1ec
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Wed Aug 19 00:25:33 2009 +0000

    Code to update the database, and updating the sysprefs.sql

commit f74b942c24d5e9c33a4ec0e5ac706a0e347eb1a7
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Tue Aug 18 02:07:22 2009 +0000

    Now hides the name on the detail screen too

commit 53c80dbef88e360a4bbb78ecff3a6ca6ec401398
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date:   Tue Aug 18 01:35:19 2009 +0000

    Allowing the librarians to choose to hide the borrowers name on holds

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-08-23 13:52:26 -04:00
878d562a52 Terminology correction: we now use the term "hold" instead of "reserve"
Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-08-12 21:14:31 -04:00
d5da1cace0 future hold request followup 4 - date controls
Fixed the calendar control for selecting the request
date in staff and OPAC so that user can explicitly
select current date and all days in the future.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-08-11 19:23:40 -04:00
Michael Hafen
74a4f29236 Allow the reserve date to be set on holds
This adds to the interface and code the ability to set the reserve date when
requesting a hold.

Resubmit.  Sorry, I formatted it from the wrong branch.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-08-11 18:02:26 -04:00
Garry Collum
e997a4a11c Bug 2553: Additional patch for the branch drop-down in Existing Holds.
Improves previous patch through the use of GetBranchesLoop. Also adds highlighting to the Existing holds table.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
2009-08-01 08:42:36 -04:00
605be873e0 Correcting some selectors to conform with upgraded jQuery syntax (see Bug 3297).
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-07-22 10:17:56 -04:00
Stephen Edwards
47690dbcc4 bug 3093: Enhance placing of holds in the staff interface.
This patch allows staff users to request reserves on multiple
items at one time.

Added checkboxes, select-all, clear-all, and place-hold button to
staff search results page.  Place-hold button will only appear if
the user has permission to place holds for others.  Item-level
Place-Hold button will not appear for multiple holds, nor will
the vertical detail menu.

Patron input page now shows multiple items, if applicable.

Hold confirmation page shows results for multiple items, if
applicable.  Those which cannot be reserved are highlighted and
are excluded from the reservation.  The reservation is placed at
the biblio number (i.e. next available) level.

Fixed display of item type.

Removed side menu for multiple items; removed item-oriented button for multiple items.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-04-24 06:12:06 -05:00
Galen Charlton
684cea4309 bug 3049: display correct due date of renewed loans
The intranet item display provided by moredetail.pl
would display the original due date of the item, and
would thus be incorrect if the item had been renewed
and got a different due date.

The incorrect date was coming from items.onloan,
which AddIssue() sets to the due date.  This patch
fixes the bug in two ways:

[1] AddRenewal() now updates items.onloan with the
    correct due date.
[2] Two templates were updated to display the
    due date from (indirectly) issues.date_due
    instead of items.onloan, thus making it less
    likely that the wrong value will be displayed.

This patch does *not* update items.onloan to reflect
the correct due date.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-04-08 14:51:32 -05:00
b70cd9f3eb Adding patron address to select patron form.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-04-01 10:49:27 -05:00
66b96f079a Adding Copy Number column to table of item information on holds pages.
Fixes Bug 2753, Hold screen needs to show copy number.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-03-04 09:27:49 -06:00
Jesse Weaver
1301705150 Add holds policies
This adds holds policy creation support to smart rules and read support to
C4/Circulation.pm, and the two reservation pages. It also adds a system
preference, AllowHoldPolicyOverride, to control whether the staff can override
these policies.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Daniel Sweeney <daniel.sweeney@liblime.com>
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2009-01-16 08:21:07 -06:00
17c4b7c17e Changing checkboxes to radio buttons (as it is in the OPAC), since you can't place a hold on more than one specific item. Also includes some markup cleanup.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-10-22 15:59:00 -05:00
182f9df495 More fixes for Bug 2600, enabling the appearance of HTML tags in item titles. Resubmission.
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-09-26 09:06:13 -05:00
730ef80520 Spelling corrections: organisation->organization, authorise->authorize, catalogue->catalog
Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-09-02 15:43:29 -05:00
Galen Charlton
26469d87a2 bug 2520: don't change item-level requests to bib-level
Prior to this fix, changing the priority of any hold requests
in the queue of requests for a bib would convert
all item-level requests to title-level requests.

As part of this fix, improved display of the holds queue
so that item-level and bib-level requests can be more
clearly distinguished.

Documentation note: new screenshot of list of requests for
a bib in the staff interface.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
2008-08-18 07:15:28 -05:00
ac7c215be3 Markup corrections. You can't embed a <!-- TMPL_IF --> inside an HTML tag because it causes problems for the translation script.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-06-17 14:05:53 -05:00
Joshua Ferraro
5f6af04ee1 nomenclature cleanup: s/Branch/Library/ s/Document Type/Item Type/ 2008-05-30 11:36:04 -05:00
Paul POULAIN
25b7f1b56d reserve at itemlevel was displayed only if item-level_itype
This patch just moves the checkbox out of the <tmpl_if item-level_itypes>

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-05-05 05:45:38 -05:00
Ryan Higgins
e00966e073 Report borrower's home library on reserves library mismatch.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-03-25 07:20:22 -05:00
Joshua Ferraro
d72a2d9f85 partial fix for bug 1891
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-03-17 23:19:05 -05:00
d21544f6a5 Markup corrections and formatting dialogs.
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-03 16:29:14 -06:00
d6e9d207c9 Formatting error message as standard dialog
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-03 01:20:35 -06:00
9aadee2f92 Some refinements to statuses and messages. Beginning to standardize call number displays.
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-03 01:20:33 -06:00
Chris Cormack
db37744333 Bugfix for 1725 request.pl erroring with a biblio that has no items
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2008-01-01 17:43:40 -06:00
Chris Cormack
fdda3d48d1 Fix for bug 1708
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-30 20:51:24 -06:00
Joshua Ferraro
2143002750 IMPORTANT: BUGFIXING STATUSES
Major bugfixes:
* Circulation status in moredetail.pl now correctly displays On loan
status and Date due
* Bugfixes on Status column in detail.pl
   * Removed hard-coded English strings from status column in detail.pl
      * Added missing auth values for lost and damaged statuses, sane
defaults if those auth
     values don't exist
        * Added missing 'On hold' status and 'Hold waiting' status
display

Medium bugfixes:
* Now correctly shows itemtype at level specified in systempreference
* Uses itemtypeimage for display, image title is full itemtype
description

* Fixed Location column concatenation between branchname location and
itemcallnumber
  * broke out Location (branch), Collection (items.location)
      Call Number (itemcallnumber) into their own columns
        * Added auth value display for items.location

	Minor fixes:
	* detail.pl didn't show dates correctly
	* nomenclature s/Checked out/On loan/ in opac-detail.tmpl
	* s/Book/Item/ in my $desc="Item Returned
".$iteminfo->{'barcode'}; in Circulation.pm
* request.tmpl: s/date_due/onloan/ to display date due
* Fixed SimilarItems, XISBNSimilarItems

NOTE: Needs to be ported to OPAC

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-24 13:34:44 -06:00
Joshua Ferraro
80a37880ac improvements for translation, switch to use same views as rest of biblio
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-24 02:00:33 -06:00
Joshua Ferraro
43334b8cec bugfixing request.pl
Major Fix:
Fixing bug where 'expected' label existed for items that
were 'waiting'

Minor Cleanup:
Show correct statuses
Show itemtypes at correct levels depending on
global system preference
Display branch names, not branch codes
Adding in visibility option for 'canreservefromotherbranches' syspref

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-24 00:43:26 -06:00
Joshua Ferraro
61d8942a20 show itemtypes at level specified in syspref for holds
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-24 00:43:14 -06:00
Joshua Ferraro
8a9e6801df fixing requests.tmpl, adding side-tabs (views)
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-23 21:55:16 -06:00
0102c89954 Formatting dialog in additem.tmpl, markup correction in request.tmpl
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-12-13 17:21:50 -06:00
73da5f99db Continuing reformatting of returns.tmpl; Correcting javascript error in request.tmpl.
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-11-27 15:58:10 -06:00
0c454c95b7 Tweaking holds screen, trying to get additional patron information to show up in holds sidebar; Tweaks to serials interface, including overhaul of subscription-add screen
Signed-off-by: Chris Cormack <crc@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
2007-10-11 15:56:51 -05:00
24ede7cad9 Refining holds menu display; restructuring forgotton stopwords.tmpl with breadcrumbs, layout, etc; Formatting reports-home.tmpl as "dashboard."
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-10-02 15:44:19 -05:00
78df55c5a5 More work to toolbars and menus. Adding experimental YUI-based toolbar to detail.tmpl. Adding dashboard-style layout to tools-home.tmpl. Correcting markup in request.tmpl. Adding patron information variables to request.pl for display in holds-menu.inc.
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-10-02 15:40:03 -05:00
21b08b3b20 General work on menus and toolbars, as well as some minor terminology changes on some pages.
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-09-29 16:00:48 -05:00
4b09332aed More tweaks to holds interface. Using js to link hold item and hold any checkboxes.
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-09-29 16:00:43 -05:00
Chris Cormack
23bd5325cb Fix for bug with request.pl not showing an error message if a borrower is not found
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-09-27 17:01:36 -05:00
401dce8971 Various random noodlings: - Visual changes to circ, detail, request, and member pages. Fixed checkouts/reserves tabs on circulation.tmpl. Moved new form-layout CSS into staff-global.css and generalized it for wider use. Refined patron details sidebar for use on circulation.tmpl
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-09-27 16:32:52 -05:00
Paul POULAIN
a477061dc9 BUGFIX #670
Ported code from librarian interface, as it works here

Signed-off-by: Chris Cormack <crc@liblime.com>
2007-09-24 15:31:45 -05:00
Chris Cormack
1a4fc157bf Applying the fix for bug 1416 from paul
Had to edit the patch as it was corrupt
2007-09-20 17:39:43 -05:00
eb427ffda3 Continuing addition of resident search form, other markup corrections.
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-09-11 16:41:35 -05:00
b2d476aa5c Continuing integration of breadcrumbs and resident search form, now on member pages. The search form tabs need to be handled in a more sane manner given that they might have multiple options. Either a custom handling script for the different includes or a js-library-based system that will handle all of them.
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-09-10 15:58:44 -05:00
039df85cf9 Moving inline script blocks to <head> where possible
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-09-04 16:35:52 -05:00
c44f56fcac Moving </head><body> into body of templates so that js and css can be embedded per-page.
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-08-30 15:50:54 -05:00
62e94fd1b0 More changes to enable YUI-Grids CSS layout
Signed-off-by: Chris Cormack <crc@liblime.com>
2007-08-28 16:50:44 -05:00