Koha-community
/
Koha
13
5
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Bug 20157: Use group 'features' to decide which groups to use for group searching functionality 

Instead of basing the group searches on the group name, which is an
inherently touchy system, we should use the same checkbox style that
Jonathan introduced for the patron limits by group feature.

Test Plan:
1) Check to ensure existing group searches still show as they used to

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
18.05.x
Kyle Hall 6 years ago
committed by Jonathan Druart
parent
9f961c963d
commit
f353a6caac
6 changed files with 85 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      C4/Auth.pm
  2. 11
      Koha/Library/Groups.pm
  3. 13
      installer/data/mysql/atomicupdate/bug_20157.perl
  4. 2
      installer/data/mysql/kohastructure.sql
  5. 87
      koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
  6. 4
      opac/opac-search.pl

4
C4/Auth.pm
View File

@ -513,11 +513,11 @@ sub get_template_and_user {
$opac_name = C4::Context->userenv->{'branch'};
}
my $search_groups = Koha::Library::Groups->get_search_groups();
my @search_groups = Koha::Library::Groups->get_search_groups();
$template->param(
OpacAdditionalStylesheet => C4::Context->preference("OpacAdditionalStylesheet"),
AnonSuggestions => "" . C4::Context->preference("AnonSuggestions"),
LibrarySearchGroups => $search_groups,
LibrarySearchGroups => \@search_groups,
opac_name => $opac_name,
LibraryName => "" . C4::Context->preference("LibraryName"),
LibraryNameTitle => "" . $LibraryNameTitle,

11
Koha/Library/Groups.pm
View File

@ -60,16 +60,15 @@ sub get_search_groups {
my ( $self, $params ) = @_;
my $interface = $params->{interface} || q{};
my $title = $interface eq 'staff' ? '__SEARCH_GROUPS__' : '__SEARCH_GROUPS_OPAC__';
my $field = $interface eq 'staff' ? 'ft_search_groups_staff' : 'ft_search_groups_opac';
my ($search_groups_root) =
$self->search( { parent_id => undef, title => $title } );
my @search_groups = $self->search( { $field => 1 } );
return unless $search_groups_root;
return unless @search_groups;
my $children = $search_groups_root->children();
my @children = map { $_->children() } @search_groups;
return wantarray ? $children->as_list : $children;
return @children;
}
=head3 type

13
installer/data/mysql/atomicupdate/bug_20157.perl
View File

@ -0,0 +1,13 @@
$DBversion = 'XXX'; # will be replaced by the RM
if( CheckVersion( $DBversion ) ) {
if( !column_exists( 'library_groups', 'ft_search_groups_opac' ) ) {
$dbh->do( "ALTER TABLE library_groups ADD COLUMN ft_search_groups_opac tinyint(1) NOT NULL DEFAULT 0 AFTER ft_hide_patron_info" );
$dbh->do( "ALTER TABLE library_groups ADD COLUMN ft_search_groups_staff tinyint(1) NOT NULL DEFAULT 0 AFTER ft_search_groups_opac" );
$dbh->do( "UPDATE library_groups SET ft_search_groups_staff = 1 WHERE title = '__SEARCH_GROUPS__'" );
$dbh->do( "UPDATE library_groups SET ft_search_groups_opac = 1 WHERE title = '__SEARCH_GROUPS_OPAC__'" );
}
SetVersion( $DBversion );
print "Upgrade to $DBversion done (Bug 20157 - Use group 'features' to decide which groups to use for group searching functionality)\n";
}

2
installer/data/mysql/kohastructure.sql
View File

@ -4144,6 +4144,8 @@ CREATE TABLE library_groups (
title VARCHAR(100) NULL DEFAULT NULL, -- Short description of the goup
description TEXT NULL DEFAULT NULL, -- Longer explanation of the group, if necessary
ft_hide_patron_info tinyint(1) NOT NULL DEFAULT 0, -- Turn on the feature "Hide patron's info" for this group
ft_search_groups_opac tinyint(1) NOT NULL DEFAULT 0, -- Use this group for staff side search groups
ft_search_groups_staff tinyint(1) NOT NULL DEFAULT 0, -- Use this group for opac side search groups
created_on TIMESTAMP NULL, -- Date and time of creation
updated_on TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, -- Date and time of last
PRIMARY KEY id ( id ),

87
koha-tmpl/intranet-tmpl/prog/en/modules/admin/library_groups.tt
View File

@ -26,7 +26,9 @@
var title = $(this).data('groupTitle');
var description = $(this).data('groupDescription');
var ft_hide_patron_info = $(this).data('groupFt_hide_patron_info');
edit_group( id, parent_id, title, description, ft_hide_patron_info );
var ft_search_groups_opac = $(this).data('groupFt_search_groups_opac');
var ft_search_groups_staff = $(this).data('groupFt_search_groups_staff');
edit_group( id, parent_id, title, description, ft_hide_patron_info, ft_search_groups_opac, ft_search_groups_staff );
});
$('.delete-group').on('click', function() {
@ -54,30 +56,31 @@
});
$('#add-group-modal-ft_hide_patron_info').prop('checked', false);
$('#add-group-modal-ft_search_groups_opac').prop('checked', false);
$('#add-group-modal-ft_search_groups_staff').prop('checked', false);
if ( parent_id ) {
$('#add-group-modal-ft_hide_patron_info').parent().hide();
$('#root-group-features-edit').hide();
} else {
$('#add-group-modal-ft_hide_patron_info').parent().show();
$('#root-group-features-edit').show();
}
$('#add-group-modal').modal('show');
}
function edit_group( id, parent_id, title, description, ft_hide_patron_info ) {
function edit_group( id, parent_id, title, description, ft_hide_patron_info, ft_search_groups_opac, ft_search_groups_staff ) {
$('#edit-group-modal-id').val( id );
$('#edit-group-modal-title').val( title );
$('#edit-group-modal-description').val( description );
if ( parent_id ) {
$('#edit-group-modal-ft_hide_patron_info').prop('checked', false);
$('#edit-group-modal-ft_hide_patron_info').parent().hide();
$('#edit-group-modal-ft_search_groups_opac').prop('checked', false);
$('#edit-group-modal-ft_search_groups_staff').prop('checked', false);
$('#root-group-features-edit').hide();
} else {
if ( ft_hide_patron_info ) {
$('#edit-group-modal-ft_hide_patron_info').prop('checked', true);
} else {
$('#edit-group-modal-ft_hide_patron_info').prop('checked', false);
}
$('#edit-group-modal-ft_hide_patron_info').parent().show();
$('#edit-group-modal-ft_hide_patron_info').prop('checked', ft_hide_patron_info ? true : false );
$('#edit-group-modal-ft_search_groups_opac').prop('checked', ft_search_groups_opac ? true : false );
$('#edit-group-modal-ft_search_groups_staff').prop('checked', ft_search_groups_staff ? true : false );
$('#root-group-features-edit').show();
}
$('#edit-group-modal').on('shown', function() {
@ -188,12 +191,24 @@
<label for="add-group-modal-description">Description: </label>
<input type="text" name="description" id="add-group-modal-description" />
</p>
<h3>Features</h3>
<div class="checkbox">
<label>
<input type="checkbox" name="ft_hide_patron_info" id="add-group-modal-ft_hide_patron_info" value="1" />
Limit patron data access by group
</label>
<div id="root-group-features-add">
<h3>Features</h3>
<div class="checkbox">
<label>
<input type="checkbox" name="ft_hide_patron_info" id="add-group-modal-ft_hide_patron_info" value="1" />
Limit patron data access by group
</label>
<p>
<label>
<input type="checkbox" name="ft_search_groups_opac" id="add-group-modal-ft_search_groups_opac" value="1" />
Use for OPAC search groups
</label>
<p>
<label>
<input type="checkbox" name="ft_search_groups_staff" id="add-group-modal-ft_search_groups_staff" value="1" />
Use for staff search groups
</label>
</div>
</div>
</div>
<div class="modal-footer">
@ -226,12 +241,24 @@
<label for="edit-group-modal-description">Description: </label>
<input type="text" id="edit-group-modal-description" name="description" value="" />
</p>
<h3>Features</h3>
<div class="checkbox">
<label>
<input type="checkbox" id="edit-group-modal-ft_hide_patron_info" name="ft_hide_patron_info" value="1" />
Limit patron data access by group
</label>
<div id="root-group-features-edit">
<h3>Features</h3>
<div class="checkbox">
<label>
<input type="checkbox" id="edit-group-modal-ft_hide_patron_info" name="ft_hide_patron_info" value="1" />
Limit patron data access by group
</label>
<p>
<label>
<input type="checkbox" id="edit-group-modal-ft_search_groups_opac" name="ft_search_groups_opac" value="1" />
Use for OPAC search groups
</label>
<p>
<label>
<input type="checkbox" id="edit-group-modal-ft_search_groups_staff" name="ft_search_groups_staff" value="1" />
Use for staff search groups
</label>
</div>
</div>
</div>
<div class="modal-footer">
@ -306,9 +333,17 @@
</td>
<td>
[% UNLESS group.branchcode %]
<ul>
[% IF group.ft_hide_patron_info %]
<span> * Hide patron's info for librarians outside of this group.</span>
<li>Hide patron's info for librarians outside of this group.</li>
[% END %]
[% IF group.ft_search_groups_opac %]
<li>Use for OPAC search groups</li>
[% END %]
[% IF group.ft_search_groups_staff %]
<li>Use for staff search groups</li>
[% END %]
</ul>
[% END %]
</td>
<td>
@ -325,7 +360,7 @@
</li>
<li>
<a class="edit-group" id="edit-group-[% group.id %]" href="#" class="edit-group" data-group-id="[% group.id %]" data-group-parent-id="[% group.parent_id %]" data-group-title="[% group.title | html %]" data-group-description="[% group.description | html %]" data-group-ft_hide_patron_info="[% group.ft_hide_patron_info | html %]">
<a class="edit-group" id="edit-group-[% group.id %]" href="#" class="edit-group" data-group-id="[% group.id %]" data-group-parent-id="[% group.parent_id %]" data-group-title="[% group.title | html %]" data-group-description="[% group.description | html %]" data-group-ft_hide_patron_info="[% group.ft_hide_patron_info | html %]" data-group-ft_search_groups_opac="[% group.ft_search_groups_opac | html %]" data-group-ft_search_groups_staff="[% group.ft_search_groups_staff | html %]" >
<i class="fa fa-pencil"></i> Edit
</a>
</li>

4
opac/opac-search.pl
View File

@ -214,8 +214,8 @@ if ($cgi->cookie("search_path_code")) {
}
}
my $search_groups = Koha::Library::Groups->get_search_groups();
$template->param( search_groups => $search_groups );
my @search_groups = Koha::Library::Groups->get_search_groups();
$template->param( search_groups => \@search_groups );
# load the language limits (for search)
my $languages_limit_loop = getLanguages($lang, 1);

Write Preview
Loading…
Cancel
Save