From 244eed710c77c9fc42b12d2537bbd90099eae3c9 Mon Sep 17 00:00:00 2001
From: miker <miker@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Fri, 12 Feb 2010 17:13:27 +0000
Subject: [PATCH] Addressing https://bugs.launchpad.net/evergreen/+bug/520632
git-svn-id: svn://svn.open-ils.org/ILS/trunk@15523 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
Open-ILS/web/opac/common/js/opac_utils.js | 4 ++--
Open-ILS/web/opac/common/js/org_utils.js | 13 +++++++------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Open-ILS/web/opac/common/js/opac_utils.js b/Open-ILS/web/opac/common/js/opac_utils.js
index e005b1c9b5..dcec5f3909 100644
--- a/Open-ILS/web/opac/common/js/opac_utils.js
+++ b/Open-ILS/web/opac/common/js/opac_utils.js
@@ -1021,7 +1021,7 @@ function buildOrgSel(selector, org, offset, namecol) {
var kids = org.children();
if (kids) {
for( var c = 0; c < kids.length; c++ )
- buildOrgSel( selector, org.children()[c], offset, namecol);
+ buildOrgSel( selector, kids[c], offset, namecol);
}
}
@@ -1034,7 +1034,7 @@ function buildMergedOrgSel(selector, org_list, offset, namecol) {
var kids = org.children();
if (kids) {
for( var c = 0; c < kids.length; c++ )
- buildOrgSel( selector, org.children()[c], offset, namecol);
+ buildOrgSel( selector, kids[c], offset, namecol);
}
}
}
diff --git a/Open-ILS/web/opac/common/js/org_utils.js b/Open-ILS/web/opac/common/js/org_utils.js
index 9fe33f47d9..675a29ed27 100644
--- a/Open-ILS/web/opac/common/js/org_utils.js
+++ b/Open-ILS/web/opac/common/js/org_utils.js
@@ -33,7 +33,7 @@ function findOrgDepth(org_id_or_node) {
function findOrgTypeFromDepth(depth) {
if( depth == null ) return null;
- for( var type in globalOrgTypes ) {
+ for( var type = 0; type < globalOrgTypes.length; type++ ) {
var t = globalOrgTypes[type];
if( t.depth() == depth ) return t;
}
@@ -43,7 +43,7 @@ function findOrgTypeFromDepth(depth) {
the org type object */
function findOrgType(type_id) {
if(typeof type_id == 'object') return type_id;
- for(var type in globalOrgTypes) {
+ for(var type = 0; type < globalOrgTypes.length; type++) {
var t =globalOrgTypes[type];
if( t.id() == type_id || t.id() == parseInt(type_id) )
return t;
@@ -60,7 +60,7 @@ function findOrgUnit(org_id) {
function findOrgLasso(lasso_id) {
if (typeof lasso_id == 'object') return lasso_id;
- for (var i in _lasso) {
+ for (var i = 0; i < _lasso.length; i++) {
if (_lasso[i].id() == lasso_id) return _lasso[i];
}
return null;
@@ -96,8 +96,9 @@ function findSiblingOrgs(node) { return findOrgUnit(node.parent_ou()).children()
function orgIsMine(me, org) {
if(!me || !org) return false;
if(me.id() == org.id()) return true;
- for( var i in me.children() ) {
- if(orgIsMine(me.children()[i], org))
+ var kids = me.children();
+ for( var i = 0; i < kids.legnth; i++ ) {
+ if(orgIsMine(kids[i], org))
return true;
}
return false;
@@ -114,7 +115,7 @@ function orgIsMineFromSet(meList, org) {
var orgArraySearcher = {};
var globalOrgTree;
-for (var i in _l) {
+for (var i = 0; i < _l.length; i++) {
var x = new aou();
x.id(_l[i][0]);
x.ou_type(_l[i][1]);
--
2.11.0