Search button instead of fire-on-change

git-svn-id: svn://svn.open-ils.org/ILS/trunk@15576 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/web/js/ui/default/acq/po/events.js b/Open-ILS/web/js/ui/default/acq/po/events.js
index afb99e3..5f063dc 100644 (file)
--- a/Open-ILS/web/js/ui/default/acq/po/events.js
+++ b/Open-ILS/web/js/ui/default/acq/po/events.js
@@ -15,7 +15,15 @@ function eventInit() {
         buildStateSelector();
         buildOrgSelector();
         buildDatePickers();
+        eventGrid.resetStore();
         buildEventGrid();
+
+        eventGrid.cancelSelected = function() { doSelected('open-ils.acq.purchase_order.event.cancel.batch') };
+        eventGrid.resetSelected = function() { doSelected('open-ils.acq.purchase_order.event.reset.batch') };
+        eventGrid.doSearch = function() {
+            buildEventGrid();
+        }
+
     } catch(E) {
         //dump('Error in acq/events.js, eventInit(): ' + E);
         throw(E);
@@ -42,8 +50,6 @@ function buildDatePickers() {
                 this.setValue( swap );
             }
             eventStartDateRange = this.getValue();
-            eventGrid.resetStore();
-            buildEventGrid();
         }
     );
     dojo.connect(
@@ -57,8 +63,6 @@ function buildDatePickers() {
                 this.setValue( swap );
             }
             eventEndDateRange = this.getValue();
-            eventGrid.resetStore();
-            buildEventGrid();
         }
     );
 
@@ -85,8 +89,6 @@ function buildStateSelector() {
             function() {
                 try {
                      eventState = this.getValue();
-                     eventGrid.resetStore();
-                     buildEventGrid();
                 } catch(E) {
                     //dump('Error in acq/events.js, eventInit, connect, onChange: ' + E);
                     throw(E);
@@ -110,8 +112,6 @@ function buildOrgSelector() {
                     function() {
                         try {
                              eventContextOrg = this.getValue();
-                             eventGrid.resetStore();
-                             buildEventGrid();
                         } catch(E) {
                             //dump('Error in acq/events.js, eventInit, connect, onChange: ' + E);
                             throw(E);
@@ -125,9 +125,6 @@ function buildOrgSelector() {
         };
         new openils.User().buildPermOrgSelector('STAFF_LOGIN', eventContextOrgSelect, null, connect);
 
-        eventGrid.cancelSelected = function() { doSelected('open-ils.acq.purchase_order.event.cancel.batch') };
-        eventGrid.resetSelected = function() { doSelected('open-ils.acq.purchase_order.event.reset.batch') };
-
     } catch(E) {
         //dump('Error in acq/events.js, buildOrgSelector(): ' + E);
         throw(E);
@@ -167,8 +164,7 @@ function doSelected(method) {
                 oncomplete: function(r) {
                     try {
                         var result = openils.Util.readResponse(r);
-                         eventGrid.resetStore();
-                         buildEventGrid();
+                        buildEventGrid();
                     } catch(E) {
                         //dump('Error in acq/events.js, doSelected(), oncomplete(): ' + E);
                         throw(E);
@@ -183,6 +179,7 @@ function doSelected(method) {
 }
 
 function buildEventGrid() {
+    eventGrid.resetStore();
     if(eventContextOrg == null) {
         eventContextOrg = openils.User.user.ws_ou();
     }

diff --git a/Open-ILS/web/templates/default/acq/po/events.tt2 b/Open-ILS/web/templates/default/acq/po/events.tt2
index b9befec..c24b459 100644 (file)
--- a/Open-ILS/web/templates/default/acq/po/events.tt2
+++ b/Open-ILS/web/templates/default/acq/po/events.tt2
@@ -42,6 +42,7 @@
                     dojoType="dijit.form.DateTextBox"
                     jsId="eventEndDatePicker" />
             </span>
+            <button dojoType="dijit.form.Button" onClick="eventGrid.doSearch()">Search</button>
         </div>
         <table  jsId="eventGrid"
                 dojoType="openils.widget.AutoGrid"