[open-ils-commits] [GIT] Evergreen ILS branch master updated. 76976c7fd09e47ca71ebb8c2311b690f11dac594

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  76976c7fd09e47ca71ebb8c2311b690f11dac594 (commit)
       via  370e61be2a1fcf8f9e63dece7c770358c3237ae0 (commit)
      from  e087d43fc733c96563a50abdd3ce33865f234ee4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 76976c7fd09e47ca71ebb8c2311b690f11dac594
Author: Bill Erickson <berick at esilibrary.com>
Date:   Thu Jun 21 16:19:10 2012 -0400

    ACQ Provider holding subfield field name options
    
    Provide a list of valid holding subfield types for the provider holding
    subfield grid in the provider admin UI.
    
    The current list includes:
    
    quantity
    estimated_price
    owning_lib
    call_number
    fund_code
    circ_modifier
    note
    copy_location
    barcode
    collection_code
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

diff --git a/Open-ILS/src/templates/conify/global/acq/provider.tt2 b/Open-ILS/src/templates/conify/global/acq/provider.tt2
index cb47934..04fd467 100644
--- a/Open-ILS/src/templates/conify/global/acq/provider.tt2
+++ b/Open-ILS/src/templates/conify/global/acq/provider.tt2
@@ -144,6 +144,20 @@
                         editOnEnter='true'>
                 </table>
             </div>
+            <div class='hidden'>
+                <select dojoType='dijit.form.FilteringSelect' jsId='holdingSubfieldSelector'>
+                    <option value='quantity'>[% l('Quantity') %]</option>
+                    <option value='estimated_price'>[% l('Estimated Price') %]</option>
+                    <option value='owning_lib'>[% l('Owning Library') %]</option>
+                    <option value='call_number'>[% l('Call Number') %]</option>
+                    <option value='fund_code'>[% l('Fund Code') %]</option>
+                    <option value='circ_modifier'>[% l('Circ Modifier') %]</option>
+                    <option value='note'>[% l('Note') %]</option>
+                    <option value='copy_location'>[% l('Shelving Location') %]</option>
+                    <option value='barcode'>[% l('Barcode') %]</option>
+                    <option value='collection_code'>[% l('Collection Code') %]</option>
+                </select>
+            </div>
         </div>
 
         <div dojoType="dijit.layout.ContentPane" title="Invoices" id="tab-invoice">
diff --git a/Open-ILS/web/js/ui/default/conify/global/acq/provider.js b/Open-ILS/web/js/ui/default/conify/global/acq/provider.js
index 44eeb77..cba7645 100644
--- a/Open-ILS/web/js/ui/default/conify/global/acq/provider.js
+++ b/Open-ILS/web/js/ui/default/conify/global/acq/provider.js
@@ -156,6 +156,10 @@ function drawProviderSummary(child) {
         case 'tab-hold': 
             phsListGrid.overrideEditWidgets.provider = new
                 dijit.form.TextBox({disabled: 'true', value: providerId});
+            phsListGrid.overrideEditWidgets.name = holdingSubfieldSelector;
+            phsListGrid.onEditPane = function(pane) {
+                holdingSubfieldSelector.attr('value', pane.fmObject.name());
+            }
             phsListGrid.resetStore();
             phsListGrid.loadAll({order_by:{acqphsm : 'name'}}, {provider : providerId});
             break;

commit 370e61be2a1fcf8f9e63dece7c770358c3237ae0
Author: Bill Erickson <berick at esilibrary.com>
Date:   Thu Jun 21 16:18:40 2012 -0400

    Fire onEditPane handler for edit dialogs spawned from AutoGrid
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

diff --git a/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js b/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js
index 12c2ef2..ddc3e58 100644
--- a/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js
+++ b/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js
@@ -410,6 +410,7 @@ if(!dojo._hasResource['openils.widget.AutoGrid']) {
                 this.editDialog = new openils.widget.EditDialog({editPane:pane});
                 this.editDialog.startup();
                 this.editDialog.show();
+                if(this.onEditPane) this.onEditPane(pane);
             },
 
             /**

-----------------------------------------------------------------------

Summary of changes:
 .../src/templates/conify/global/acq/provider.tt2   |   14 ++++++++++++++
 Open-ILS/web/js/dojo/openils/widget/AutoGrid.js    |    1 +
 .../js/ui/default/conify/global/acq/provider.js    |    4 ++++
 3 files changed, 19 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS