From: Bill Erickson Date: Tue, 27 Mar 2012 19:37:40 +0000 (-0400) Subject: GridColumnPicker terminology repairs X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=557fdad4013436c7d94e8479524f638bdb737cbe;p=evergreen%2Fequinox.git GridColumnPicker terminology repairs Change the configuration attribute columnPickerPrefix to columnPersistKey. Most notably, it's not a prefix (it's a suffix), nor is its pre/suffixiness relevant to the user. Signed-off-by: Bill Erickson --- diff --git a/Open-ILS/src/templates/acq/picklist/user_request.tt2 b/Open-ILS/src/templates/acq/picklist/user_request.tt2 index 2a392c0f7f..9518f3c456 100644 --- a/Open-ILS/src/templates/acq/picklist/user_request.tt2 +++ b/Open-ILS/src/templates/acq/picklist/user_request.tt2 @@ -51,7 +51,7 @@ defaultCellWidth='"auto"' showPaginator='true' showColumnPicker='true' - columnPickerPrefix='"acq.picklist.user_request"'> + columnPersistKey='"acq.picklist.user_request"'> diff --git a/Open-ILS/src/templates/conify/flattener_test.tt2 b/Open-ILS/src/templates/conify/flattener_test.tt2 index 0bcad40540..b7404f4cf8 100644 --- a/Open-ILS/src/templates/conify/flattener_test.tt2 +++ b/Open-ILS/src/templates/conify/flattener_test.tt2 @@ -23,7 +23,7 @@ id="gridNode" jsid="grid" dojoType="openils.widget.FlattenerGrid" - columnPickerPrefix='"conify.flattener_test"' + columnPersistKey='"conify.flattener_test"' fmClass="'acp'" autoHeight="10" editOnEnter="true" diff --git a/Open-ILS/src/templates/conify/global/config/barcode_completion.tt2 b/Open-ILS/src/templates/conify/global/config/barcode_completion.tt2 index 6928b9472c..593d5780b3 100644 --- a/Open-ILS/src/templates/conify/global/config/barcode_completion.tt2 +++ b/Open-ILS/src/templates/conify/global/config/barcode_completion.tt2 @@ -16,7 +16,7 @@ editStyle='pane' editOnEnter='true' showColumnPicker='true' - columnPickerPrefix='"conify.config.barcode_completion"'> + columnPersistKey='"conify.config.barcode_completion"'> diff --git a/Open-ILS/src/templates/conify/global/config/circ_limit_set.tt2 b/Open-ILS/src/templates/conify/global/config/circ_limit_set.tt2 index 213870610a..9f9b90fa20 100644 --- a/Open-ILS/src/templates/conify/global/config/circ_limit_set.tt2 +++ b/Open-ILS/src/templates/conify/global/config/circ_limit_set.tt2 @@ -19,7 +19,7 @@ editStyle='pane' editOnEnter='true' showColumnPicker='true' - columnPickerPrefix='"conify.config.circ_limit_set"'> + columnPersistKey='"conify.config.circ_limit_set"'> diff --git a/Open-ILS/src/templates/conify/global/config/circ_matrix_matchpoint.tt2 b/Open-ILS/src/templates/conify/global/config/circ_matrix_matchpoint.tt2 index 67386f0ee9..6bdfced4ab 100644 --- a/Open-ILS/src/templates/conify/global/config/circ_matrix_matchpoint.tt2 +++ b/Open-ILS/src/templates/conify/global/config/circ_matrix_matchpoint.tt2 @@ -16,7 +16,7 @@ editStyle='pane' editOnEnter='true' showColumnPicker='true' - columnPickerPrefix='"conify.config.circ_matrix_matchpoint"'> + columnPersistKey='"conify.config.circ_matrix_matchpoint"'> diff --git a/Open-ILS/src/templates/conify/global/config/hold_matrix_matchpoint.tt2 b/Open-ILS/src/templates/conify/global/config/hold_matrix_matchpoint.tt2 index 0823484852..def6292861 100644 --- a/Open-ILS/src/templates/conify/global/config/hold_matrix_matchpoint.tt2 +++ b/Open-ILS/src/templates/conify/global/config/hold_matrix_matchpoint.tt2 @@ -15,7 +15,7 @@ editStyle='pane' editOnEnter='true' showColumnPicker='true' - columnPickerPrefix='"conify.config.hold_matrix_matchpoint"'> + columnPersistKey='"conify.config.hold_matrix_matchpoint"'>
diff --git a/Open-ILS/src/templates/vandelay/inc/import_errors.tt2 b/Open-ILS/src/templates/vandelay/inc/import_errors.tt2 index 821363c530..bf5e6398c8 100644 --- a/Open-ILS/src/templates/vandelay/inc/import_errors.tt2 +++ b/Open-ILS/src/templates/vandelay/inc/import_errors.tt2 @@ -31,7 +31,7 @@ query="{id: '*'}" hidePaginator='true' showColumnPicker='true' - columnPickerPrefix='"vandelay.item.import_error"' + columnPersistKey='"vandelay.item.import_error"' fmClass='vii'> @@ -65,7 +65,7 @@ query="{id: '*'}" showPaginator='true' showColumnPicker='true' - columnPickerPrefix='"vandelay.item.import_error"' + columnPersistKey='"vandelay.item.import_error"' fmClass='vii'> diff --git a/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js b/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js index 9210b367b1..d7652769e1 100644 --- a/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js +++ b/Open-ILS/web/js/dojo/openils/widget/AutoGrid.js @@ -29,7 +29,7 @@ if(!dojo._hasResource['openils.widget.AutoGrid']) { selectorWidth : '1.5', lineNumberWidth : '1.5', showColumnPicker : false, - columnPickerPrefix : null, + columnPersistKey : null, displayLimit : 15, displayOffset : 0, requiredFields : null, @@ -60,11 +60,11 @@ if(!dojo._hasResource['openils.widget.AutoGrid']) { this._showing_create_pane = false; if(this.showColumnPicker) { - if(!this.columnPickerPrefix) { - console.error("No columnPickerPrefix defined"); + if(!this.columnPersistKey) { + console.error("No columnPersistKey defined"); } else { var picker = new openils.widget.GridColumnPicker( - openils.User.authtoken, this.columnPickerPrefix, this); + openils.User.authtoken, this.columnPersistKey, this); if(openils.User.authtoken) { picker.load(); } else { diff --git a/Open-ILS/web/js/dojo/openils/widget/FlattenerGrid.js b/Open-ILS/web/js/dojo/openils/widget/FlattenerGrid.js index 74e76e3a1c..acac26633b 100644 --- a/Open-ILS/web/js/dojo/openils/widget/FlattenerGrid.js +++ b/Open-ILS/web/js/dojo/openils/widget/FlattenerGrid.js @@ -14,7 +14,7 @@ if (!dojo._hasResource["openils.widget.FlattenerGrid"]) { /* These potential constructor arguments are useful to * lattenerGrid in their own right */ "columnReordering": true, - "columnPickerPrefix": null, + "columnPersistKey": null, /* These potential constructor arguments maybe useful to * FlattenerGrid in their own right, and are passed to @@ -121,7 +121,7 @@ if (!dojo._hasResource["openils.widget.FlattenerGrid"]) { if (!this.columnPicker) { this.columnPicker = new openils.widget.GridColumnPicker( - null, this.columnPickerPrefix, this); + null, this.columnPersistKey, this); this.columnPicker.load(); } diff --git a/Open-ILS/web/js/dojo/openils/widget/GridColumnPicker.js b/Open-ILS/web/js/dojo/openils/widget/GridColumnPicker.js index 0aa8ffccc9..7e0dceaa41 100644 --- a/Open-ILS/web/js/dojo/openils/widget/GridColumnPicker.js +++ b/Open-ILS/web/js/dojo/openils/widget/GridColumnPicker.js @@ -30,9 +30,9 @@ if(!dojo._hasResource["openils.widget.GridColumnPicker"]) { USER_PERSIST_SETTING : 'ui.grid_columns', - constructor : function (authtoken, persistPrefix, grid, structure) { + constructor : function (authtoken, persistKey, grid, structure) { this.grid = grid; - this.persistPrefix = persistPrefix; + this.persistKey = this.USER_PERSIST_SETTING+'.'+persistKey; this.authtoken = authtoken || openils.User.authtoken; this.structure = structure || this.grid.structure; this.cells = this.structure[0].cells[0].slice(); @@ -219,9 +219,9 @@ if(!dojo._hasResource["openils.widget.GridColumnPicker"]) { } var setting = {}; - var setName = this.USER_PERSIST_SETTING+'.'+this.persistPrefix; - setting[setName] = {'columns':list, 'auto':autos}; + setting[this.persistKey] = {'columns':list, 'auto':autos}; + var _this = this; fieldmapper.standardRequest( ['open-ils.actor', 'open-ils.actor.patron.settings.update'], { async: true, @@ -231,7 +231,7 @@ if(!dojo._hasResource["openils.widget.GridColumnPicker"]) { }, onmethoderror : function() {}, onerror : function() { - console.log("No user setting '" + setName + "' configured. Cannot persist") + console.log("No user setting '" + _this.persistKey + "' configured. Cannot persist") } } ); @@ -291,7 +291,7 @@ if(!dojo._hasResource["openils.widget.GridColumnPicker"]) { fieldmapper.standardRequest( ['open-ils.actor', 'open-ils.actor.patron.settings.retrieve'], { async: true, - params: [this.authtoken, null, this.USER_PERSIST_SETTING+'.'+this.persistPrefix], + params: [this.authtoken, null, this.persistKey], oncomplete: function(r) { var set = openils.Util.readResponse(r); if(set) {