May 2025 - Evergreen-commits - Evergreen Mailing Lists Server

[GIT] Evergreen ILS branch main updated. e980c5972d1d055fe18829faaa36ddea60945c14
by Git User 19 May '25

19 May '25

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, main has been updated via e980c5972d1d055fe18829faaa36ddea60945c14 (commit) from 4a0ab93c888738b5ca77fb4a53560b29874133b7 (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 e980c5972d1d055fe18829faaa36ddea60945c14 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Tue Mar 18 22:56:44 2025 +0000 LP2099938 Checkbox border contrast & background color Increases the contrast of checkbox borders and unsets some Bootstrap background and appearance styles that sometimes resulted in a solid, filled-in look on checked checkboxes. Release-note: Fixes checkbox border contrast and missing check marks Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Susan Morrison <smorrison(a)georgialibraries.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/styles.css b/Open-ILS/src/eg2/src/styles.css index c8db58979f..5519dba904 100644 --- a/Open-ILS/src/eg2/src/styles.css +++ b/Open-ILS/src/eg2/src/styles.css @@ -393,6 +393,10 @@ input, textarea, select, option, input[type="checkbox"], .form-check-input { --bs-border-color: var(--form-check-border); --bs-border-width: 2px; + appearance: revert; + background-color: unset; + background-image: unset; + border-radius: 0.15rem; min-width: 1rem; min-height: 1rem; } ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/styles.css | 4 ++++ 1 file changed, 4 insertions(+) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 4a830327a8f4ca621c49ba8dd29dccf7fc8f614d
by Git User 19 May '25

19 May '25

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_3_14 has been updated via 4a830327a8f4ca621c49ba8dd29dccf7fc8f614d (commit) from 5564d664fbb7f34b53c25a91b117b019be44761a (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 4a830327a8f4ca621c49ba8dd29dccf7fc8f614d Author: Steven Mayo <smayo(a)georgialibraries.org> Date: Tue Sep 17 17:42:10 2024 -0400 LP2080887 Dark Mode: White Flash Betweeb Ang/AngJS Adds a backup script changing color mode from local storage to the heads of Angular and AngularJS. Happens early enough to not make a flash. Signed-off-by: Steven Mayo <smayo(a)georgialibraries.org> Signed-off-by: Susan Morrison <smorrison(a)georgialibraries.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/index.html b/Open-ILS/src/eg2/src/index.html index 9ecb4c51fb..18589d3137 100644 --- a/Open-ILS/src/eg2/src/index.html +++ b/Open-ILS/src/eg2/src/index.html @@ -6,6 +6,12 @@ <base href="/eg2"> <meta name="viewport" content="width=device-width, initial-scale=1"> <link rel="icon" type="image/x-icon" href="favicon.ico"> + <script> + const colormode = localStorage.getItem('eg.ui.general.colormode'); + if (colormode) { + document.documentElement.setAttribute('data-bs-theme', colormode.replaceAll("\"", "")); + } + </script> </head> <body> <eg-root></eg-root> diff --git a/Open-ILS/src/templates/staff/base.tt2 b/Open-ILS/src/templates/staff/base.tt2 index 682916c167..7f2fb1b77c 100644 --- a/Open-ILS/src/templates/staff/base.tt2 +++ b/Open-ILS/src/templates/staff/base.tt2 @@ -34,6 +34,12 @@ <link rel="stylesheet" href="[% ctx.base_path %]/staff/css/dark.css" /> <link rel="stylesheet" href="[% ctx.base_path %]/staff/css/nav.css" /> <link rel="stylesheet" href="[% ctx.base_path %]/staff/css/grid.css" /> + <script> + const colormode = localStorage.getItem('eg.ui.general.colormode'); + if (colormode) { + document.documentElement.setAttribute('data-bs-theme', colormode.replaceAll("\"", "")); + } + </script> </head> <body> ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/index.html | 6 ++++++ Open-ILS/src/templates/staff/base.tt2 | 6 ++++++ 2 files changed, 12 insertions(+) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. 466f04b0a753203d2e6bc9c12c1dd8d7d1cd46bf
by Git User 19 May '25

19 May '25

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_3_15 has been updated via 466f04b0a753203d2e6bc9c12c1dd8d7d1cd46bf (commit) from c8c33a6b8e9533f28b4e909171572c7723202616 (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 466f04b0a753203d2e6bc9c12c1dd8d7d1cd46bf Author: Steven Mayo <smayo(a)georgialibraries.org> Date: Tue Sep 17 17:42:10 2024 -0400 LP2080887 Dark Mode: White Flash Betweeb Ang/AngJS Adds a backup script changing color mode from local storage to the heads of Angular and AngularJS. Happens early enough to not make a flash. Signed-off-by: Steven Mayo <smayo(a)georgialibraries.org> Signed-off-by: Susan Morrison <smorrison(a)georgialibraries.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/index.html b/Open-ILS/src/eg2/src/index.html index 9ecb4c51fb..18589d3137 100644 --- a/Open-ILS/src/eg2/src/index.html +++ b/Open-ILS/src/eg2/src/index.html @@ -6,6 +6,12 @@ <base href="/eg2"> <meta name="viewport" content="width=device-width, initial-scale=1"> <link rel="icon" type="image/x-icon" href="favicon.ico"> + <script> + const colormode = localStorage.getItem('eg.ui.general.colormode'); + if (colormode) { + document.documentElement.setAttribute('data-bs-theme', colormode.replaceAll("\"", "")); + } + </script> </head> <body> <eg-root></eg-root> diff --git a/Open-ILS/src/templates/staff/base.tt2 b/Open-ILS/src/templates/staff/base.tt2 index 682916c167..7f2fb1b77c 100644 --- a/Open-ILS/src/templates/staff/base.tt2 +++ b/Open-ILS/src/templates/staff/base.tt2 @@ -34,6 +34,12 @@ <link rel="stylesheet" href="[% ctx.base_path %]/staff/css/dark.css" /> <link rel="stylesheet" href="[% ctx.base_path %]/staff/css/nav.css" /> <link rel="stylesheet" href="[% ctx.base_path %]/staff/css/grid.css" /> + <script> + const colormode = localStorage.getItem('eg.ui.general.colormode'); + if (colormode) { + document.documentElement.setAttribute('data-bs-theme', colormode.replaceAll("\"", "")); + } + </script> </head> <body> ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/index.html | 6 ++++++ Open-ILS/src/templates/staff/base.tt2 | 6 ++++++ 2 files changed, 12 insertions(+) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 4a0ab93c888738b5ca77fb4a53560b29874133b7
by Git User 19 May '25

19 May '25

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, main has been updated via 4a0ab93c888738b5ca77fb4a53560b29874133b7 (commit) from fbbe827ff2e259a0273fc9b2f953a9ffda0283ed (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 4a0ab93c888738b5ca77fb4a53560b29874133b7 Author: Steven Mayo <smayo(a)georgialibraries.org> Date: Tue Sep 17 17:42:10 2024 -0400 LP2080887 Dark Mode: White Flash Betweeb Ang/AngJS Adds a backup script changing color mode from local storage to the heads of Angular and AngularJS. Happens early enough to not make a flash. Signed-off-by: Steven Mayo <smayo(a)georgialibraries.org> Signed-off-by: Susan Morrison <smorrison(a)georgialibraries.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/index.html b/Open-ILS/src/eg2/src/index.html index 9ecb4c51fb..18589d3137 100644 --- a/Open-ILS/src/eg2/src/index.html +++ b/Open-ILS/src/eg2/src/index.html @@ -6,6 +6,12 @@ <base href="/eg2"> <meta name="viewport" content="width=device-width, initial-scale=1"> <link rel="icon" type="image/x-icon" href="favicon.ico"> + <script> + const colormode = localStorage.getItem('eg.ui.general.colormode'); + if (colormode) { + document.documentElement.setAttribute('data-bs-theme', colormode.replaceAll("\"", "")); + } + </script> </head> <body> <eg-root></eg-root> diff --git a/Open-ILS/src/templates/staff/base.tt2 b/Open-ILS/src/templates/staff/base.tt2 index 682916c167..7f2fb1b77c 100644 --- a/Open-ILS/src/templates/staff/base.tt2 +++ b/Open-ILS/src/templates/staff/base.tt2 @@ -34,6 +34,12 @@ <link rel="stylesheet" href="[% ctx.base_path %]/staff/css/dark.css" /> <link rel="stylesheet" href="[% ctx.base_path %]/staff/css/nav.css" /> <link rel="stylesheet" href="[% ctx.base_path %]/staff/css/grid.css" /> + <script> + const colormode = localStorage.getItem('eg.ui.general.colormode'); + if (colormode) { + document.documentElement.setAttribute('data-bs-theme', colormode.replaceAll("\"", "")); + } + </script> </head> <body> ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/index.html | 6 ++++++ Open-ILS/src/templates/staff/base.tt2 | 6 ++++++ 2 files changed, 12 insertions(+) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 5564d664fbb7f34b53c25a91b117b019be44761a
by Git User 19 May '25

19 May '25

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_3_14 has been updated via 5564d664fbb7f34b53c25a91b117b019be44761a (commit) from e40c352e8560898b0a66b962a251f8184614c240 (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 5564d664fbb7f34b53c25a91b117b019be44761a Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Fri Apr 4 05:50:22 2025 +0000 LP1819068 Offset for AngJS focused primary button Changes the hover/focus border to an outline and adds an outline offset on .btn-primary in the AngularJS interfaces. This makes it easier to see the blue outline around the blue buttons. Release-note: Offsets the focus outline on primary buttons in AngularJS Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Gina Monti <gmonti(a)biblio.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/templates/staff/css/style.css.tt2 b/Open-ILS/src/templates/staff/css/style.css.tt2 index 924b115fd1..314abcbead 100644 --- a/Open-ILS/src/templates/staff/css/style.css.tt2 +++ b/Open-ILS/src/templates/staff/css/style.css.tt2 @@ -707,8 +707,10 @@ input, textarea, select, option, .btn-primary.active, .show > .btn-primary.dropdown-toggle { background-color: var(--primary-hover); - border-color: var(--primary-border); color: var(--bs-white); + outline-color: var(--primary-border); + outline-offset: 2px; + outline-width: 2px; } .btn-outline-primary { ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/templates/staff/css/style.css.tt2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. c8c33a6b8e9533f28b4e909171572c7723202616
by Git User 19 May '25

19 May '25

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_3_15 has been updated via c8c33a6b8e9533f28b4e909171572c7723202616 (commit) from 575cade0e053201d3d0eb3d0dc10d2f968db8a40 (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 c8c33a6b8e9533f28b4e909171572c7723202616 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Fri Apr 4 05:50:22 2025 +0000 LP1819068 Offset for AngJS focused primary button Changes the hover/focus border to an outline and adds an outline offset on .btn-primary in the AngularJS interfaces. This makes it easier to see the blue outline around the blue buttons. Release-note: Offsets the focus outline on primary buttons in AngularJS Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Gina Monti <gmonti(a)biblio.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/templates/staff/css/style.css.tt2 b/Open-ILS/src/templates/staff/css/style.css.tt2 index 924b115fd1..314abcbead 100644 --- a/Open-ILS/src/templates/staff/css/style.css.tt2 +++ b/Open-ILS/src/templates/staff/css/style.css.tt2 @@ -707,8 +707,10 @@ input, textarea, select, option, .btn-primary.active, .show > .btn-primary.dropdown-toggle { background-color: var(--primary-hover); - border-color: var(--primary-border); color: var(--bs-white); + outline-color: var(--primary-border); + outline-offset: 2px; + outline-width: 2px; } .btn-outline-primary { ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/templates/staff/css/style.css.tt2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. fbbe827ff2e259a0273fc9b2f953a9ffda0283ed
by Git User 19 May '25

19 May '25

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, main has been updated via fbbe827ff2e259a0273fc9b2f953a9ffda0283ed (commit) from 3df0ccdcd7322af0a798cedf8d31839da99e4f69 (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 fbbe827ff2e259a0273fc9b2f953a9ffda0283ed Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Fri Apr 4 05:50:22 2025 +0000 LP1819068 Offset for AngJS focused primary button Changes the hover/focus border to an outline and adds an outline offset on .btn-primary in the AngularJS interfaces. This makes it easier to see the blue outline around the blue buttons. Release-note: Offsets the focus outline on primary buttons in AngularJS Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Gina Monti <gmonti(a)biblio.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/templates/staff/css/style.css.tt2 b/Open-ILS/src/templates/staff/css/style.css.tt2 index 924b115fd1..314abcbead 100644 --- a/Open-ILS/src/templates/staff/css/style.css.tt2 +++ b/Open-ILS/src/templates/staff/css/style.css.tt2 @@ -707,8 +707,10 @@ input, textarea, select, option, .btn-primary.active, .show > .btn-primary.dropdown-toggle { background-color: var(--primary-hover); - border-color: var(--primary-border); color: var(--bs-white); + outline-color: var(--primary-border); + outline-offset: 2px; + outline-width: 2px; } .btn-outline-primary { ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/templates/staff/css/style.css.tt2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. e40c352e8560898b0a66b962a251f8184614c240
by Git User 19 May '25

19 May '25

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_3_14 has been updated via e40c352e8560898b0a66b962a251f8184614c240 (commit) from 9cfc23e9da7a0a0d5ecd26dbde8101ec52cdb4b0 (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 e40c352e8560898b0a66b962a251f8184614c240 Author: Terran McCanna <tmccanna(a)georgialibraries.org> Date: Thu Mar 13 10:36:30 2025 -0400 LP2102217 Holdings View Sublibrary Sort Order Org node children are currently sorted by org node children first followed by call number node children. This changes the sort order to place call number children first, followed by org node children to reduce visual confusion. Release-note: Changes holdings view sort order to push sublibrary nodes below call number nodes. Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> Signed-off-by: Lindsay Stratton <lstratton(a)wlsmail.org> diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.ts index 6abef94e20..55795cefea 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.ts @@ -405,18 +405,26 @@ export class HoldingsMaintenanceComponent implements OnInit { traverseOrg(this.holdingsTree.root); } - // Org node children are sorted with any child org nodes pushed to the - // front, followed by the call number nodes sorted alphabetcially by label. + // Org node children are sorted by call number nodes attached to the org unit first, + // followed by child org unit nodes. Peers are sorted alphabetically by label. + // Example: If SYS2-BR3 has holdings but also has a bookmobile SYS2-BR3-BM1 + // that has its own holdings then the hierarchy should display as: + // SYS2 + // - BR3 + // - - MR248 (BR3's holdings) + // - - BM1 + // - - - MR248 (BM1's holdings) + sortOrgNodeChildren(node: HoldingsTreeNode) { node.children = node.children.sort((a, b) => { if (a.nodeType === 'org') { if (b.nodeType === 'org') { return a.target.shortname() < b.target.shortname() ? -1 : 1; } else { - return -1; + return 1; } } else if (b.nodeType === 'org') { - return 1; + return -1; } else { // TODO: should this use label sortkey instead of // the compiled call number label? ----------------------------------------------------------------------- Summary of changes: .../src/app/staff/catalog/record/holdings.component.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. 575cade0e053201d3d0eb3d0dc10d2f968db8a40
by Git User 19 May '25

19 May '25

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_3_15 has been updated via 575cade0e053201d3d0eb3d0dc10d2f968db8a40 (commit) from 0e5fd9da82dac541c79a2c663b56aa4d92b1fb9e (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 575cade0e053201d3d0eb3d0dc10d2f968db8a40 Author: Terran McCanna <tmccanna(a)georgialibraries.org> Date: Thu Mar 13 10:36:30 2025 -0400 LP2102217 Holdings View Sublibrary Sort Order Org node children are currently sorted by org node children first followed by call number node children. This changes the sort order to place call number children first, followed by org node children to reduce visual confusion. Release-note: Changes holdings view sort order to push sublibrary nodes below call number nodes. Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> Signed-off-by: Lindsay Stratton <lstratton(a)wlsmail.org> diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.ts index ab66e2ddb8..e1e70861e7 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.ts @@ -407,18 +407,26 @@ export class HoldingsMaintenanceComponent implements OnInit { traverseOrg(this.holdingsTree.root); } - // Org node children are sorted with any child org nodes pushed to the - // front, followed by the call number nodes sorted alphabetcially by label. + // Org node children are sorted by call number nodes attached to the org unit first, + // followed by child org unit nodes. Peers are sorted alphabetically by label. + // Example: If SYS2-BR3 has holdings but also has a bookmobile SYS2-BR3-BM1 + // that has its own holdings then the hierarchy should display as: + // SYS2 + // - BR3 + // - - MR248 (BR3's holdings) + // - - BM1 + // - - - MR248 (BM1's holdings) + sortOrgNodeChildren(node: HoldingsTreeNode) { node.children = node.children.sort((a, b) => { if (a.nodeType === 'org') { if (b.nodeType === 'org') { return a.target.shortname() < b.target.shortname() ? -1 : 1; } else { - return -1; + return 1; } } else if (b.nodeType === 'org') { - return 1; + return -1; } else { // TODO: should this use label sortkey instead of // the compiled call number label? ----------------------------------------------------------------------- Summary of changes: .../src/app/staff/catalog/record/holdings.component.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 3df0ccdcd7322af0a798cedf8d31839da99e4f69
by Git User 19 May '25

19 May '25

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, main has been updated via 3df0ccdcd7322af0a798cedf8d31839da99e4f69 (commit) from 4c67fc697bc54e1f408a565c252523d69d4404c0 (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 3df0ccdcd7322af0a798cedf8d31839da99e4f69 Author: Terran McCanna <tmccanna(a)georgialibraries.org> Date: Thu Mar 13 10:36:30 2025 -0400 LP2102217 Holdings View Sublibrary Sort Order Org node children are currently sorted by org node children first followed by call number node children. This changes the sort order to place call number children first, followed by org node children to reduce visual confusion. Release-note: Changes holdings view sort order to push sublibrary nodes below call number nodes. Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> Signed-off-by: Lindsay Stratton <lstratton(a)wlsmail.org> diff --git a/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.ts b/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.ts index ab66e2ddb8..e1e70861e7 100644 --- a/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/catalog/record/holdings.component.ts @@ -407,18 +407,26 @@ export class HoldingsMaintenanceComponent implements OnInit { traverseOrg(this.holdingsTree.root); } - // Org node children are sorted with any child org nodes pushed to the - // front, followed by the call number nodes sorted alphabetcially by label. + // Org node children are sorted by call number nodes attached to the org unit first, + // followed by child org unit nodes. Peers are sorted alphabetically by label. + // Example: If SYS2-BR3 has holdings but also has a bookmobile SYS2-BR3-BM1 + // that has its own holdings then the hierarchy should display as: + // SYS2 + // - BR3 + // - - MR248 (BR3's holdings) + // - - BM1 + // - - - MR248 (BM1's holdings) + sortOrgNodeChildren(node: HoldingsTreeNode) { node.children = node.children.sort((a, b) => { if (a.nodeType === 'org') { if (b.nodeType === 'org') { return a.target.shortname() < b.target.shortname() ? -1 : 1; } else { - return -1; + return 1; } } else if (b.nodeType === 'org') { - return 1; + return -1; } else { // TODO: should this use label sortkey instead of // the compiled call number label? ----------------------------------------------------------------------- Summary of changes: .../src/app/staff/catalog/record/holdings.component.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) hooks/post-receive -- Evergreen ILS

1 0