Cleaned up autogrid so it works better; only added a few lines of code to the

legacy stuff. There is now filtering, everything is visible on one page (so
sorts work better) and some of the scrollbar issues should be gone.

Signed-off-by: Joseph Lewis <joehms22@gmail.com>

diff --git a/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js b/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js
index ecbdf95..2ef86f6 100644 (file)
--- a/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js
+++ b/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js
@@ -33,6 +33,7 @@ if(!dojo._hasResource['openils.widget.AutoGrid']) {
             hidePaginator : false,
             showLoadFilter : false,
             suppressLinkedFields : null, // list of fields whose linked display data should not be fetched from the server
+            showBackForward : true,
 
             /* by default, don't show auto-generated (sequence) fields */
             showSequenceFields : false, 
@@ -85,32 +86,35 @@ if(!dojo._hasResource['openils.widget.AutoGrid']) {
                     this.paginator = new dijit.layout.ContentPane();
 
 
-                    var back = dojo.create('a', {
-                        innerHTML : 'Back',  // TODO i18n
-                        style : 'padding-right:6px;',
-                        href : 'javascript:void(0);', 
-                        onclick : function() { 
-                            self.cachedQueryOpts.offset = self.displayOffset -= self.displayLimit;
-                            if(self.displayOffset < 0)
-                                self.cachedQueryOpts.offset = self.displayOffset = 0;
-                            self.refresh();
-                        }
-                    });
-
-                    var forw = dojo.create('a', {
-                        innerHTML : 'Next',  // TODO i18n
-                        style : 'padding-right:6px;',
-                        href : 'javascript:void(0);', 
-                        onclick : function() { 
-                            self.cachedQueryOpts.offset = self.displayOffset += self.displayLimit;
-                            self.refresh();
-                        }
-                    });
-
                     dojo.place(this.paginator.domNode, this.domNode, 'before');
-                    dojo.place(back, this.paginator.domNode);
-                    dojo.place(forw, this.paginator.domNode);
-
+                    
+                    if(this.showBackForward) {
+                        var back = dojo.create('a', {
+                            innerHTML : 'Back',  // TODO i18n
+                            style : 'padding-right:6px;',
+                            href : 'javascript:void(0);', 
+                            onclick : function() { 
+                                self.cachedQueryOpts.offset = self.displayOffset -= self.displayLimit;
+                                if(self.displayOffset < 0)
+                                    self.cachedQueryOpts.offset = self.displayOffset = 0;
+                                self.refresh();
+                            }
+                        });
+
+                        var forw = dojo.create('a', {
+                            innerHTML : 'Next',  // TODO i18n
+                            style : 'padding-right:6px;',
+                            href : 'javascript:void(0);', 
+                            onclick : function() { 
+                                self.cachedQueryOpts.offset = self.displayOffset += self.displayLimit;
+                                self.refresh();
+                            }
+                        });
+                        
+                        dojo.place(back, this.paginator.domNode);
+                        dojo.place(forw, this.paginator.domNode);
+                    }
+                    
                     if(this.showLoadFilter) {
                         dojo.require('openils.widget.PCrudFilterDialog');
                         dojo.place(

diff --git a/Open-ILS/web/js/ui/default/conify/global/config/circ_matrix_matchpoint.js b/Open-ILS/web/js/ui/default/conify/global/config/circ_matrix_matchpoint.js
index 1549e5c..b3ad60b 100644 (file)
--- a/Open-ILS/web/js/ui/default/conify/global/config/circ_matrix_matchpoint.js
+++ b/Open-ILS/web/js/ui/default/conify/global/config/circ_matrix_matchpoint.js
@@ -1,4 +1,5 @@
 dojo.require('dijit.layout.ContentPane');
+dojo.require('dijit.layout.LayoutContainer');
 dojo.require('dijit.form.Button');
 dojo.require('openils.widget.AutoGrid');
 dojo.require('openils.widget.AutoFieldWidget');

diff --git a/Open-ILS/web/templates/default/conify/global/config/circ_matrix_matchpoint.tt2 b/Open-ILS/web/templates/default/conify/global/config/circ_matrix_matchpoint.tt2
index b107e06..7a09a94 100644 (file)
--- a/Open-ILS/web/templates/default/conify/global/config/circ_matrix_matchpoint.tt2
+++ b/Open-ILS/web/templates/default/conify/global/config/circ_matrix_matchpoint.tt2
@@ -1,13 +1,14 @@
 [% ctx.page_title = 'Circulation Policy Configuration' %]
 [% WRAPPER default/base.tt2 %]
 <script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/conify/global/config/circ_matrix_matchpoint.js'> </script>
-<div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel'>
+<div dojoType="dijit.layout.ContentPane" layoutAlign="top" class='oils-header-panel' id='topContentPane'>
     <div>Circulation Policy Configuration</div>
     <div><button dojoType='dijit.form.Button' onClick='cmGrid.showCreatePane()'>New</button></div>
 </div>
 <div dojoType='dijit.layout.ContentPane' layoutAlign='client'>
     <table  jsId='cmGrid'
-            style='height: 600px;'
+            id='cmGridId'
+            style='height:500px;'
             dojoType='openils.widget.AutoGrid'
             fieldOrder="['id', 'active', 'grp', 'org_unit', 'copy_circ_lib', 'copy_owning_lib', 'user_home_ou', 'is_renewal', 'juvenile_flag', 'circ_modifier', 'marc_type', 'marc_form', 'marc_bib_level', 'marc_vr_format', 'ref_flag', 'usr_age_lower_bound', 'usr_age_upper_bound', 'circulate', 'duration_rule', 'renewals', 'hard_due_date', 'recurring_fine_rule', 'grace_period', 'max_fine_rule', 'available_copy_hold_ratio', 'total_copy_hold_ratio', 'script_test']"
             defaultCellWidth='"auto"'
@@ -16,6 +17,10 @@
             editStyle='pane'
             editOnEnter='true'
             showColumnPicker='true'
+            hideSelector='true'
+            showBackForward='false'
+            showLoadFilter='true'
+            displayLimit='9e15'
             columnPickerPrefix='"conify.config.circ_matrix_matchpoint"'>
             <thead>
                 <tr>
@@ -24,7 +29,6 @@
             </thead>
     </table>
 </div>
-
 <div class='hidden'>
     <div id='circ-mod-editor' style='border:1px solid #aaa'>
         <h3>Circ Modifier Count Groups</h3>