Galen Charlton [Fri, 3 Nov 2017 20:49:50 +0000 (16:49 -0400)]
fix rebase error
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Thu, 27 Oct 2016 21:31:36 +0000 (17:31 -0400)]
improve lost+paid handling
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Tue, 25 Oct 2016 16:53:32 +0000 (12:53 -0400)]
get next status & suppressed alerts working correctly
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Tue, 25 Oct 2016 14:50:32 +0000 (10:50 -0400)]
disable Manage button in Alerts column when there are no alerts
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Fri, 14 Oct 2016 20:00:06 +0000 (16:00 -0400)]
add alerts column to several grids
The item status, holdings, and checkout grids now have an
alerts column that lists the number of copy alerts associated
with the item as well as a button to manage them.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Conflicts:
Open-ILS/web/js/ui/default/staff/cat/item/app.js
Open-ILS/web/js/ui/default/staff/cat/services/holdings.js
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Thu, 13 Oct 2016 22:08:30 +0000 (18:08 -0400)]
teach egGridFields how to compile column tempates
This adds two optional attributes to eg-grid-field:
compiled: if present, treat the template inside the
element as a template to be compiled
handlers: if present, contains an object with a bucket
of functions (or whatever) that can be invoked
inside the template as "col.handlers.foo"
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Tue, 20 Sep 2016 21:19:26 +0000 (17:19 -0400)]
fix clearing copy alerts in volume/copy editor
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Mike Rylander [Mon, 12 Sep 2016 19:19:55 +0000 (15:19 -0400)]
Focus the next-status dropdown when present, otherwise nothing
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Conflicts:
Open-ILS/web/js/ui/default/staff/services/ui.js
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Fri, 2 Sep 2016 21:51:03 +0000 (17:51 -0400)]
add copy alert actions to item status page in list view
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Fri, 2 Sep 2016 21:36:25 +0000 (17:36 -0400)]
add a copy alert editor dialog
This replaces, in certain contexts, the copy alert manager,
which is now used only during checkin/checkout.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Conflicts:
Open-ILS/web/js/ui/default/staff/circ/services/circ.js
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Fri, 2 Sep 2016 20:40:29 +0000 (16:40 -0400)]
add test of asset.copy_state()
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Fri, 2 Sep 2016 20:11:20 +0000 (16:11 -0400)]
avoid transits when handling override of lost/long-overdue checkout
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Fri, 2 Sep 2016 19:56:45 +0000 (15:56 -0400)]
ensure that suppressed system alerts do not set next_status
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Fri, 2 Sep 2016 19:52:58 +0000 (15:52 -0400)]
add more auto-overrides for suppressed alerts
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Mike Rylander [Fri, 2 Sep 2016 18:33:15 +0000 (14:33 -0400)]
Remove alert focusing -- it does not work well enough. Also, remove X close button.
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Wed, 31 Aug 2016 21:52:11 +0000 (17:52 -0400)]
handing of suppressed LOST and LONGOVERDUE events
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Wed, 31 Aug 2016 21:16:19 +0000 (17:16 -0400)]
fix an initialization error
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Wed, 31 Aug 2016 21:02:17 +0000 (17:02 -0400)]
teach copy alerts how to automatically generate certain overrides
When a new-style copy alert type is active but supressed, any
system-generated events of that type should be recorded but
not present a pop-up. In some cases, an older-style circ event
make get generated; this patch supplies a way for the new copy
alerts to override the old-style events without having
to sprinkle a bunch of special checks.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Wed, 31 Aug 2016 18:11:59 +0000 (14:11 -0400)]
teach copy editor templates about copy alerts
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Wed, 31 Aug 2016 16:53:05 +0000 (12:53 -0400)]
teach copy templates how to manage copy notes
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Conflicts:
Open-ILS/web/js/ui/default/staff/cat/volcopy/app.js
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Fri, 3 Nov 2017 20:18:10 +0000 (16:18 -0400)]
update egBasicComboBox for new Bootstrap dropdown
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Mike Rylander [Wed, 31 Aug 2016 16:37:14 +0000 (12:37 -0400)]
Apply focus to the element tab-previous to the OK/Continue button in alert popups
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Sat, 27 Aug 2016 00:27:09 +0000 (20:27 -0400)]
adjust OU lookup for suppression of system-generated alerts too
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Sat, 27 Aug 2016 00:13:56 +0000 (20:13 -0400)]
check full org path of circ lib when deciding whether to suppress a copy alert
This allows for a system to suppress alerts of a given type on behalf
of all of its branches.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Sat, 27 Aug 2016 00:07:08 +0000 (20:07 -0400)]
fix bug with creating new copy alert suppression rules
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Fri, 26 Aug 2016 23:39:04 +0000 (19:39 -0400)]
add multi-select for setting copy alert type next status field
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Fri, 26 Aug 2016 15:56:41 +0000 (11:56 -0400)]
adjust labelling
- The action buttons for acknowledging a temporary
copy alert now use "Clear"
- Menu items for bringing up the copy alerts dialog
now uniformly use "Manage Copy Alerts"
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Thu, 25 Aug 2016 20:12:28 +0000 (16:12 -0400)]
set default value of 'Renewing?' to false when creating alert type
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Fri, 5 Aug 2016 20:37:36 +0000 (16:37 -0400)]
fix fleshing set of next copy statuses
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Fri, 5 Aug 2016 19:15:16 +0000 (15:15 -0400)]
when renewing, filter out alerts where in_renew is false
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Fri, 5 Aug 2016 18:16:03 +0000 (14:16 -0400)]
add add/acknowledge copy alert actions to holdings view menu
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Fri, 5 Aug 2016 17:43:22 +0000 (13:43 -0400)]
fix error made when rebasing
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Conflicts:
Open-ILS/web/js/ui/default/staff/circ/services/circ.js
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Fri, 5 Aug 2016 17:41:56 +0000 (13:41 -0400)]
fix syntax error
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Fri, 5 Aug 2016 15:59:36 +0000 (11:59 -0400)]
update from $modal to $uibModal
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Mike Rylander [Thu, 14 Apr 2016 20:27:48 +0000 (16:27 -0400)]
webstaff: Show event name in the manage interface (useful for staff alerts)
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Mike Rylander [Thu, 14 Apr 2016 20:07:08 +0000 (16:07 -0400)]
webstaff: Make alert type selection sticky when an alert is saved
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Mike Rylander [Fri, 8 Apr 2016 17:21:38 +0000 (13:21 -0400)]
Fleshed call does not find "odd" circs, fetch directly; Disable auto-overrides on existing circ to allow alerts to show up
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Conflicts:
Open-ILS/web/js/ui/default/staff/circ/services/circ.js
TODO: Verify that the resolution of the merge conflict doesn't
cause a regression on LP#
1522635
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Mike Rylander [Fri, 8 Apr 2016 15:52:18 +0000 (11:52 -0400)]
Protect the status list from empty items
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Mike Rylander [Fri, 8 Apr 2016 15:31:49 +0000 (11:31 -0400)]
Add better page titles
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Mike Rylander [Fri, 8 Apr 2016 14:48:13 +0000 (10:48 -0400)]
Use ngInit and ngOptions so we can have a nullable Event field
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Mike Rylander [Thu, 7 Apr 2016 18:50:23 +0000 (14:50 -0400)]
Array-ify next_status when sending back to client; Skip old-style status events when using new-style alert infrastructure.
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Mike Rylander [Thu, 7 Apr 2016 17:11:42 +0000 (13:11 -0400)]
Fix last commit... typo
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Mike Rylander [Thu, 7 Apr 2016 17:09:31 +0000 (13:09 -0400)]
Add dblclick handler for autoGrid
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Mike Rylander [Thu, 7 Apr 2016 16:54:29 +0000 (12:54 -0400)]
Align terminology with the copy editor
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Mike Rylander [Thu, 11 Feb 2016 18:07:33 +0000 (13:07 -0500)]
Further cleanup of location checks; remove "no" option from at_circ and at_owning
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Mike Rylander [Thu, 11 Feb 2016 17:54:25 +0000 (12:54 -0500)]
Add LONGOVERDUE to the state list
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Mike Rylander [Thu, 11 Feb 2016 17:39:54 +0000 (12:39 -0500)]
Add more seed data
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Mike Rylander [Thu, 11 Feb 2016 14:43:07 +0000 (09:43 -0500)]
Adjust display of next-status labels in the copy alert popup
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Mike Rylander [Thu, 11 Feb 2016 14:15:23 +0000 (09:15 -0500)]
Correct location test for at_circ and at_owning
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Fri, 18 Dec 2015 18:51:30 +0000 (13:51 -0500)]
tweak styling
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Fri, 18 Dec 2015 18:47:54 +0000 (13:47 -0500)]
improve init of next status
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Fri, 18 Dec 2015 18:18:46 +0000 (13:18 -0500)]
add 'add copy alert' action
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Conflicts:
Open-ILS/web/js/ui/default/staff/circ/services/circ.js
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Thu, 17 Dec 2015 23:22:10 +0000 (18:22 -0500)]
add acknowledge alerts to renewal
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Thu, 17 Dec 2015 23:13:52 +0000 (18:13 -0500)]
allow both CHECKIN and CHECKOUT alerts to fire during renewal
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Thu, 17 Dec 2015 22:59:41 +0000 (17:59 -0500)]
correctly test whether the alert_type fires during renewal
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Thu, 17 Dec 2015 22:52:52 +0000 (17:52 -0500)]
no longer display the legacy copy alert message
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Thu, 17 Dec 2015 22:47:39 +0000 (17:47 -0500)]
fix styling of manage copy alert button in item status
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Thu, 17 Dec 2015 22:40:43 +0000 (17:40 -0500)]
add new-style copy alerts to volcopy defaults selector
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Fri, 11 Dec 2015 04:15:34 +0000 (23:15 -0500)]
copy alert type editor can now create and update copy alert types
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Fri, 11 Dec 2015 03:35:57 +0000 (22:35 -0500)]
make copy alert suppression editor feature-complete
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Thu, 10 Dec 2015 23:29:31 +0000 (18:29 -0500)]
set name as copy alert type selector field
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Thu, 10 Dec 2015 23:26:31 +0000 (18:26 -0500)]
add copy alert suppression to splash page
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Thu, 10 Dec 2015 23:25:03 +0000 (18:25 -0500)]
start UI for managing copy alert suppression
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Thu, 10 Dec 2015 23:19:36 +0000 (18:19 -0500)]
add copy alerts to local admin splash page
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Thu, 10 Dec 2015 23:17:24 +0000 (18:17 -0500)]
start on a config editor for config.copy_alert_types
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Wed, 9 Dec 2015 14:58:16 +0000 (09:58 -0500)]
teach vol/copy editor how to deal with copy alerts
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Tue, 8 Dec 2015 16:22:57 +0000 (11:22 -0500)]
add copy alert ack/manage action to checkin, checkout, and item status
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Conflicts:
Open-ILS/src/templates/staff/cat/item/t_summary_pane.tt2
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Tue, 8 Dec 2015 14:22:27 +0000 (09:22 -0500)]
implement setting next status upon checkin
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Mon, 7 Dec 2015 21:44:35 +0000 (16:44 -0500)]
display text for system-generated copy alerts
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Mon, 7 Dec 2015 21:44:09 +0000 (16:44 -0500)]
return all potential next copy statuses, not just first
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Thu, 3 Dec 2015 22:26:53 +0000 (17:26 -0500)]
have a bit of visual separation between alerts
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Thu, 3 Dec 2015 22:00:23 +0000 (17:00 -0500)]
start work on egCopyAlertManagerDialog
This dialog is currently capable of:
- displaying copy alerts during checkin and checkout
- allowing the operator to acknowledge temporary alerts
TODO:
- allow display of all current alerts
- allow alerts to be added
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Conflicts:
Open-ILS/web/js/ui/default/staff/circ/services/circ.js
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Thu, 3 Dec 2015 19:55:30 +0000 (14:55 -0500)]
some sample copy alert types
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Thu, 3 Dec 2015 19:52:13 +0000 (14:52 -0500)]
don't generate system copy alerts if copy state is normal
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Thu, 3 Dec 2015 19:20:38 +0000 (14:20 -0500)]
support the LOST_AND_PAID status added in LP#
1198475
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Wed, 2 Dec 2015 22:49:01 +0000 (17:49 -0500)]
fix various thinkos and syntax errors to get the biz logic working
As of now, open-ils.circ.checkin is now starting to emit
custom copy alerts.
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Wed, 2 Dec 2015 21:08:34 +0000 (16:08 -0500)]
fix some typos, syntax errors, and stray invisible characters
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Galen Charlton [Wed, 2 Dec 2015 20:46:47 +0000 (15:46 -0500)]
add typo/space fixes to baseline schema
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Mike Rylander [Wed, 4 Nov 2015 21:27:04 +0000 (16:27 -0500)]
biz logic for alerts
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Mike Rylander [Wed, 4 Nov 2015 14:52:22 +0000 (09:52 -0500)]
Baseline IDL stuff for alerts
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Mike Rylander [Tue, 20 Oct 2015 14:10:28 +0000 (10:10 -0400)]
Initial schema for copy alerts
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Jane Sandberg [Thu, 2 Nov 2017 23:34:31 +0000 (16:34 -0700)]
Docs: Fixing menu refs on booking docs
Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Jane Sandberg [Thu, 2 Nov 2017 23:04:28 +0000 (16:04 -0700)]
Docs: replacing Admin menu with Administration menu
Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Jeanette Lundgren [Thu, 26 Oct 2017 18:09:40 +0000 (14:09 -0400)]
docs: LP1717583 add details about aged circulation
Signed-off-by: Jane Sandberg <sandbej@linnbenton.edu>
Remington Steed [Thu, 26 Oct 2017 18:37:50 +0000 (14:37 -0400)]
Docs: Fix AsciiDoc header syntax bug
This docs section header was renamed, but the underline needs to be
changed to match.
Signed-off-by: Remington Steed <rjs7@calvin.edu>
Remington Steed [Wed, 25 Oct 2017 14:53:44 +0000 (10:53 -0400)]
Docs: Remove duplicate lines from root.adoc
In the previous commit to root.adoc (
7ecad6eb) a chunk of lines were
accidentally duplicated. This commit removes the duplicate lines. I
confirmed that this change allows the PDF to build successfully.
Signed-off-by: Remington Steed <rjs7@calvin.edu>
Bill Erickson [Thu, 12 Oct 2017 15:27:27 +0000 (11:27 -0400)]
LP#
1656036 Webstaff dynamic page titles
Support page/tab titles applied by page controllers. Each title is
composed of 2 optional components, a dynamic component and a context
component.
The dynamic component may be interpolated with real-time data (e.g. a
patron's name) and the context is generally a page or tab-level value
(e.g. Checkout).
For example: "Smith, Jane - Checkout"
Apply a title within a controller like so:
egCore.strings.setPageTitle(
egCore.strings.MY_DYNAMIC_TEMPLATE,
egCore.strings.MY_CONTEXT_STRING,
{foo : 'foo', bar : 'bar'}
);
If no values are set, the default template-level title is applied.
Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Jason Boyer <jboyer@library.in.gov>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Conflicts:
Open-ILS/src/templates/staff/base_js.tt2
Open-ILS/web/js/ui/default/staff/circ/patron/app.js
Galen Charlton [Fri, 20 Oct 2017 01:06:50 +0000 (21:06 -0400)]
forward-port 2.12.7 upgrade script
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Dan Wells [Thu, 19 Oct 2017 20:38:18 +0000 (16:38 -0400)]
Forward-port 3.0.1 upgrade script
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Dan Wells [Wed, 18 Oct 2017 21:42:05 +0000 (17:42 -0400)]
Fix stray beta1 in 3.0.0 upgrade script
I do not think this actually affects anything.
We'll fix this for early adopters in the 3.0.1 upgrade script, I
think.
Signed-off-by: Dan Wells <dbw2@calvin.edu>
Kathy Lussier [Wed, 18 Oct 2017 17:07:34 +0000 (13:07 -0400)]
Docs: 3.0.1 Release notes
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Kathy Lussier [Wed, 18 Oct 2017 15:58:24 +0000 (11:58 -0400)]
Docs: 2.12.7 release notes
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Kyle Huckins [Fri, 15 Sep 2017 21:06:24 +0000 (21:06 +0000)]
LP#
1659181 Mark Items Damaged Prompt
- Add new prompt for marking an item as damaged.
- If there is a fee when marking an item as damaged, offer the
option to charge as normal, manually bill the patron, or to waive
the charge.
-Affected interfaces: Holds pull list, Holds Shelf, Patron Holds,
Record Holds, Record Holdings, Item Status(List), Item Status(Detail)
Signed-off-by: Kyle Huckins <khuckins@catalyte.io>
Changes to be committed:
modified: Open-ILS/src/perlmods/lib/OpenILS/Application/Circ.pm
modified: Open-ILS/src/templates/staff/cat/catalog/index.tt2
modified: Open-ILS/src/templates/staff/circ/checkin/index.tt2
modified: Open-ILS/src/templates/staff/circ/holds/index.tt2
new file: Open-ILS/src/templates/staff/circ/share/t_mark_damaged.tt2
modified: Open-ILS/web/js/ui/default/staff/cat/catalog/app.js
modified: Open-ILS/web/js/ui/default/staff/cat/item/app.js
modified: Open-ILS/web/js/ui/default/staff/circ/checkin/app.js
modified: Open-ILS/web/js/ui/default/staff/circ/services/circ.js
modified: Open-ILS/web/js/ui/default/staff/circ/services/holds.js
modified: Open-ILS/web/js/ui/default/staff/circ/services/item.js
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
Jane Sandberg [Wed, 18 Oct 2017 14:39:52 +0000 (07:39 -0700)]
Merge branch 'master' of git.evergreen-ils.org:Evergreen
Jeanette Lundgren [Wed, 18 Oct 2017 13:58:55 +0000 (09:58 -0400)]
DOCS: added tip for patron insensitive search (ignores punctuation)
Signed-off-by: Jeanette Lundgren <jlundgren@cwmars.org>
Cesar Velez [Wed, 4 Oct 2017 18:01:25 +0000 (14:01 -0400)]
LP#
1712686 - display completed barcode on copy grids not partial input
The check in, check out, and renew interfaces were not displaying
the actual complete(d) barcode when barcode completion is on.
This saves the inputted partial barcode in row_item.input_barcode
and let's the returned acp.barcode be in row_item.copy_barcode for
display.
Signed-off by: Cesar Velez <cesar.velez@equinoxinitiative.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Cesar Velez [Tue, 3 Oct 2017 20:42:43 +0000 (16:42 -0400)]
LP#
1714566 - enable hold notes to display on dialogs
Also display all notes in the hold shelf dialog and other dialogs
so that staff is aware of any public notes that will
print.
Signed-off by: Cesar Velez <cesar.velez@equinoxinitiative.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Cesar Velez [Mon, 2 Oct 2017 21:57:39 +0000 (17:57 -0400)]
LP#
1714566 - enable hold notes set to print on slip to be shown
Adds a bit of code and edits the realted templates in order
to be able to see any hold notes set to print on the slip.
Signed-off by: Cesar Velez <cesar.velez@equinoxinitiative.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Cesar Velez [Thu, 28 Sep 2017 17:08:48 +0000 (13:08 -0400)]
LP#
1714060 - fixes thinko when obeying patron.password.use_phone setting in patron regctl
There was a bug, an undefined variable was being used to assign the last
four digits of the day_phone to usr.passwd when this library setting
was being used.
Signed-off by: Cesar Velez <cesar.velez@equinoxinitiative.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
Cesar Velez [Thu, 28 Sep 2017 14:48:58 +0000 (10:48 -0400)]
LP#
1715423 - fix issues with the display of IDs in patron summary pane
The Patron summary pane was not properly displaying the values
for the primary ID and secondary ID. Also added the type name of
the ID in next to primary ID label.
Signed-off by: Cesar Velez <cesar.velez@equinoxinitiative.org>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
projects / working / Evergreen.git / log