[open-ils-commits] [GIT] Evergreen ILS branch rel_2_3 updated. 44684888b39212679bc98cd5472d87195806a150

[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, rel_2_3 has been updated
       via  44684888b39212679bc98cd5472d87195806a150 (commit)
       via  550f773c834cbd1a0d6d12b74994e90737c6dfde (commit)
      from  50af0816fe85c5c71d3b7bfd9cc1b192b07e74c2 (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 44684888b39212679bc98cd5472d87195806a150
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Thu Apr 18 10:49:06 2013 -0400

    Minor change to chrome/content/util/list.js.
    
    Change the initializer of this.count_for_display from 0 to 1 in
    order to match the counting of other lists in the client and to
    provide something that staff are likely to prefer.
    
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>

diff --git a/Open-ILS/xul/staff_client/chrome/content/util/list.js b/Open-ILS/xul/staff_client/chrome/content/util/list.js
index 2d4c33a..1ddfb0f 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/list.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/list.js
@@ -11,7 +11,7 @@ util.list = function (id) {
 
     this.sub_sorts = [];
 
-    this.count_for_display = 0;
+    this.count_for_display = 1;
 
     if (!this.node) throw('Could not find element ' + id);
     switch(this.node.nodeName) {

commit 550f773c834cbd1a0d6d12b74994e90737c6dfde
Author: Dmitry Nechai <nechai.dmitry at gmail.com>
Date:   Wed Apr 17 00:33:57 2013 +0300

    Fixed bug in staff client offline mode.
    
    https://bugs.launchpad.net/evergreen/+bug/1089657
    
    In list.js at start you create obj.columns for lineno, but later
    you don`t process this value so it`s return default render
    function.  This code repairs this.
    
    Signed-off-by: Dmitry Nechai <nechai.dmitry at gmail.com>
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>

diff --git a/Open-ILS/xul/staff_client/chrome/content/util/list.js b/Open-ILS/xul/staff_client/chrome/content/util/list.js
index 8166016..2d4c33a 100644
--- a/Open-ILS/xul/staff_client/chrome/content/util/list.js
+++ b/Open-ILS/xul/staff_client/chrome/content/util/list.js
@@ -11,6 +11,8 @@ util.list = function (id) {
 
     this.sub_sorts = [];
 
+    this.count_for_display = 0;
+
     if (!this.node) throw('Could not find element ' + id);
     switch(this.node.nodeName) {
         case 'listbox' : 
@@ -1227,13 +1229,27 @@ util.list.prototype = {
                 }
     
                 if (typeof params.map_row_to_column == 'function')  {
+		    if (this.columns[i].id == 'lineno'){
+
+		      label = this.count_for_display.toString();
+		      this.count_for_display++;
+
+		    } else {
     
-                    label = params.map_row_to_column(params.row,this.columns[i],this.scratch_data);
-    
+		      label = params.map_row_to_column(params.row,this.columns[i],this.scratch_data);
+
+		    }
                 } else if (typeof this.map_row_to_column == 'function') {
+		    if (this.columns[i].id == 'lineno'){
+
+		      label = this.count_for_display.toString();
+		      this.count_for_display++;
+
+		    } else {
+
+		      label = this.map_row_to_column(params.row,this.columns[i],this.scratch_data);
     
-                    label = this.map_row_to_column(params.row,this.columns[i],this.scratch_data);
-    
+		    }
                 }
                 if (this.columns[i].type == 'checkbox') { treecell.setAttribute('value',label); } else { treecell.setAttribute('label',label ? label : ''); }
                 s += ('treecell = ' + treecell + ' with label = ' + label + '\n');

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

Summary of changes:
 .../xul/staff_client/chrome/content/util/list.js   |   24 ++++++++++++++++---
 1 files changed, 20 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
Evergreen ILS