Bug 10354 - Don't show optgroup Libraries when no search groups are defined

In the OPAC, if there are no search groups defined, there's no reason to
embed library choices inside an <optgroup>. <optgroup> should only be
used to differentiate the list of individual libraries from search
groups. This patch removes the <optgroup> when no search groups are
enabled.

To test, apply the patch and:

- Enable OpacAddMastheadLibraryPulldown.
- Create a library search group in Administration ->
  Libraries and Groups and enable it by checking the "show in search
  pulldown" box.
- View the library pulldown in the OPAC search bar. Libraries and groups
  should be separated into <optgroup>s.
- Disable your library search group and refresh the OPAC page. The
  pulldown of libraries should now display libraries with no <optgroup>.

Signed-off-by: Srdjan <srdjan@catalyst.net.nz>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This commit is contained in:
Owen Leonard 2013-05-31 09:54:34 -04:00 committed by Galen Charlton
parent 5cf5da12ef
commit 545ed7a0b6

View file

@ -87,13 +87,13 @@
[% IF ( OpacAddMastheadLibraryPulldown ) %] [% IF ( OpacAddMastheadLibraryPulldown ) %]
<select name="branch_group_limit" id="select_library" class="left"> <select name="branch_group_limit" id="select_library" class="left">
<option value="">All libraries</option> <option value="">All libraries</option>
<optgroup label="Libraries"> [% IF BranchCategoriesLoop %]<optgroup label="Libraries">[% END %]
[% FOREACH BranchesLoo IN BranchesLoop %] [% FOREACH BranchesLoo IN BranchesLoop %]
[% IF ( BranchesLoo.selected ) %]<option selected="selected" value="branch:[% BranchesLoo.value %]">[% BranchesLoo.branchname %]</option> [% IF ( BranchesLoo.selected ) %]<option selected="selected" value="branch:[% BranchesLoo.value %]">[% BranchesLoo.branchname %]</option>
[% ELSE %]<option value="branch:[% BranchesLoo.value %]">[% BranchesLoo.branchname %]</option>[% END %] [% ELSE %]<option value="branch:[% BranchesLoo.value %]">[% BranchesLoo.branchname %]</option>[% END %]
[% END %] [% END %]
</optgroup>
[% IF BranchCategoriesLoop %] [% IF BranchCategoriesLoop %]
</optgroup>
<optgroup label="Groups"> <optgroup label="Groups">
[% FOREACH bc IN BranchCategoriesLoop %] [% FOREACH bc IN BranchCategoriesLoop %]
[% IF ( bc.selected ) %] [% IF ( bc.selected ) %]