]> git.evergreen-ils.org Git - working/Evergreen.git/commit - Open-ILS/web/templates/default/conify/global/booking/resource_attr.tt2
Booking: begin forward-porting code from rel_1_6.
authorsenator <senator@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Tue, 29 Jun 2010 17:53:39 +0000 (17:53 +0000)
committersenator <senator@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Tue, 29 Jun 2010 17:53:39 +0000 (17:53 +0000)
commit3314498166392a7c654c03d47c3cfc6da3d4fdb9
tree348baaa4ae415f3d6f5e2daccc052344981a7824
parent8afb24be89d4001de8b01c6f4c29617fb58e39c8
Booking: begin forward-porting code from rel_1_6.

Booking (regrettably) was largely written directly against a 1.6 environment
instead of written for trunk and backported.  So now we have booking code in
rel_1_6 and rel_1_6_1 that works, but that needs to be cleanly merged with
trunk.  There has been a lot of drift, and this won't be easy.

Here is the first step (some of the easy stuff).  These files have been updated
wholesale with their contents from rel_1_6, since they don't affect anything
other than booking itself.

Just to be clear: this commit does not complete the booking foward-port.  The
booking module did not work in trunk before this commit, and it does not work
after this commit.  For the moment, booking only works in the rel_1_6 branch,
in the rel_1_6_1 branch, and in 1.6.1.* releases.  It still does not work in
trunk, and it will take a few more hairy commits to get things in sync.

Once that's finally done, any future Booking code can be written the Right Way
(in trunk) and *back*ported thence to whatever other branches as needed.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@16827 dcc99617-32d9-48b4-a31d-7c20da2025e4
19 files changed:
Open-ILS/examples/fm_IDL.xml
Open-ILS/src/extras/ils_events.xml
Open-ILS/src/perlmods/OpenILS/Application/Booking.pm
Open-ILS/web/js/dojo/openils/booking/nls/capture.js
Open-ILS/web/js/dojo/openils/booking/nls/pickup_and_return.js
Open-ILS/web/js/dojo/openils/booking/nls/pull_list.js
Open-ILS/web/js/dojo/openils/booking/nls/reservation.js
Open-ILS/web/js/ui/default/booking/capture.js
Open-ILS/web/js/ui/default/booking/common.js
Open-ILS/web/js/ui/default/booking/populator.js
Open-ILS/web/js/ui/default/booking/pull_list.js
Open-ILS/web/js/ui/default/booking/reservation.js
Open-ILS/web/templates/default/booking/capture.tt2
Open-ILS/web/templates/default/booking/pull_list.tt2
Open-ILS/web/templates/default/conify/global/booking/resource.tt2
Open-ILS/web/templates/default/conify/global/booking/resource_attr.tt2
Open-ILS/web/templates/default/conify/global/booking/resource_attr_map.tt2
Open-ILS/web/templates/default/conify/global/booking/resource_attr_value.tt2
Open-ILS/web/templates/default/conify/global/booking/resource_type.tt2