#
# This file is part of Koha.
#
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
#
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
#
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
#
-use strict;
-use warnings;
-use CGI;
+use Modern::Perl;
+
+use CGI qw ( -utf8 );
use List::MoreUtils qw/uniq/;
use C4::Auth;
use C4::Context;
use C4::Output;
use C4::Koha;
-use C4::Members qw/GetBorrowercategoryList/;
use C4::Members::AttributeTypes;
+use Koha::AuthorisedValues;
+use Koha::Libraries;
+use Koha::Patron::Categories;
+
my $script_name = "/cgi-bin/koha/admin/patron-attr-types.pl";
our $input = new CGI;
my $op = $input->param('op') || '';
-our ($template, $loggedinuser, $cookie)
- = get_template_and_user({template_name => "admin/patron-attr-types.tmpl",
- query => $input,
- type => "intranet",
- authnotrequired => 0,
- flagsrequired => {parameters => 'parameters_remaining_permissions'},
- debug => 1,
- });
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ { template_name => "admin/patron-attr-types.tt",
+ query => $input,
+ type => "intranet",
+ authnotrequired => 0,
+ flagsrequired => { parameters => 'parameters_remaining_permissions' }
+ }
+);
+
$template->param(script_name => $script_name);
sub add_attribute_type_form {
my $template = shift;
+ my $branches = Koha::Libraries->search( {}, { order_by => ['branchname'] } )->unblessed;
+ my @branches_loop;
+ foreach my $branch (@$branches) {
+ push @branches_loop, {
+ branchcode => $branch->{branchcode},
+ branchname => $branch->{branchname},
+ };
+ }
+
+ my $patron_categories = Koha::Patron::Categories->search_limited({}, {order_by => ['description']});
$template->param(
attribute_type_form => 1,
confirm_op => 'add_attribute_type_confirmed',
- categories => GetBorrowercategoryList,
+ categories => $patron_categories,
+ branches_loop => \@branches_loop,
);
- authorised_value_category_list($template);
- pa_classes($template);
+ $template->param(classes_val_loop => GetAuthorisedValues( 'PA_CLASS'));
}
sub error_add_attribute_type_form {
my $template = shift;
- $template->param(description => $input->param('description'));
+ $template->param(description => scalar $input->param('description'));
if ($input->param('repeatable')) {
$template->param(repeatable_checked => 1);
if ($input->param('unique_id')) {
$template->param(unique_id_checked => 1);
}
- if ($input->param('password_allowed')) {
- $template->param(password_allowed_checked => 1);
- }
if ($input->param('opac_display')) {
$template->param(opac_display_checked => 1);
}
+ if ($input->param('opac_editable')) {
+ $template->param(opac_editable_checked => 1);
+ }
if ($input->param('staff_searchable')) {
$template->param(staff_searchable_checked => 1);
}
$template->param(display_checkout_checked => 'checked="checked"');
}
- $template->param( category_code => $input->param('category_code') );
- $template->param( class => $input->param('class') );
+ $template->param( category_code => scalar $input->param('category_code') );
+ $template->param( class => scalar $input->param('class') );
$template->param(
attribute_type_form => 1,
confirm_op => 'add_attribute_type_confirmed',
+ authorised_value_category => scalar $input->param('authorised_value_category'),
);
- authorised_value_category_list($template, $input->param('authorised_value_category'));
}
sub add_update_attribute_type {
my $opac_display = $input->param('opac_display');
$attr_type->opac_display($opac_display);
+ my $opac_editable = $input->param('opac_editable');
+ $attr_type->opac_editable($opac_editable);
my $staff_searchable = $input->param('staff_searchable');
$attr_type->staff_searchable($staff_searchable);
my $authorised_value_category = $input->param('authorised_value_category');
$attr_type->authorised_value_category($authorised_value_category);
- my $password_allowed = $input->param('password_allowed');
- $attr_type->password_allowed($password_allowed);
my $display_checkout = $input->param('display_checkout');
$attr_type->display_checkout($display_checkout);
- $attr_type->category_code($input->param('category_code'));
- $attr_type->class($input->param('class'));
+ $attr_type->category_code(scalar $input->param('category_code'));
+ $attr_type->class(scalar $input->param('class'));
+ my @branches = $input->multi_param('branches');
+ $attr_type->branches( \@branches );
if ($op eq 'edit') {
$template->param(edited_attribute_type => $attr_type->code());
$template->param(unique_id_checked => 1);
}
$template->param(unique_id_disabled => 1);
- if ($attr_type->password_allowed()) {
- $template->param(password_allowed_checked => 1);
- }
if ($attr_type->opac_display()) {
$template->param(opac_display_checked => 1);
}
+ if ($attr_type->opac_editable()) {
+ $template->param(opac_editable_checked => 1);
+ }
if ($attr_type->staff_searchable()) {
$template->param(staff_searchable_checked => 1);
}
if ($attr_type->display_checkout()) {
$template->param(display_checkout_checked => 'checked="checked"');
}
- authorised_value_category_list($template, $attr_type->authorised_value_category());
- pa_classes( $template, $attr_type->class );
+ $template->param( authorised_value_category => $attr_type->authorised_value_category() );
+ $template->param(classes_val_loop => GetAuthorisedValues( 'PA_CLASS' ));
+
+ my $branches = Koha::Libraries->search( {}, { order_by => ['branchname'] } )->unblessed;
+ my @branches_loop;
+ my $selected_branches = $attr_type->branches;
+ foreach my $branch (@$branches) {
+ my $selected = ( grep {$_->{branchcode} eq $branch->{branchcode}} @$selected_branches ) ? 1 : 0;
+ push @branches_loop, {
+ branchcode => $branch->{branchcode},
+ branchname => $branch->{branchname},
+ selected => $selected,
+ };
+ }
+ $template->param( branches_loop => \@branches_loop );
- $template->param ( category_code => $attr_type->category_code );
- $template->param ( category_description => $attr_type->category_description );
+ $template->param(
+ category_code => $attr_type->category_code,
+ category_class => $attr_type->class,
+ category_description => $attr_type->category_description,
+ );
+ my $patron_categories = Koha::Patron::Categories->search({}, {order_by => ['description']});
$template->param(
attribute_type_form => 1,
edit_attribute_type => 1,
confirm_op => 'edit_attribute_type_confirmed',
- categories => GetBorrowercategoryList,
+ categories => $patron_categories,
);
}
sub patron_attribute_type_list {
my $template = shift;
- my @attr_types = C4::Members::AttributeTypes::GetAttributeTypes();
- my @classes = uniq( map {$_->{class}} @attr_types );
+ my @attr_types = C4::Members::AttributeTypes::GetAttributeTypes( 1, 1 );
+
+ my @classes = uniq( map { $_->{class} } @attr_types );
@classes = sort @classes;
my @attributes_loop;
for my $class (@classes) {
- my @items;
+ my ( @items, $branches );
for my $attr (@attr_types) {
- push @items, $attr if $attr->{class} eq $class
+ next if $attr->{class} ne $class;
+ my $attr_type = C4::Members::AttributeTypes->fetch($attr->{code});
+ $attr->{branches} = $attr_type->branches;
+ push @items, $attr;
}
- my $lib = GetAuthorisedValueByCode( 'PA_CLASS', $class ) || $class;
+ my $av = Koha::AuthorisedValues->search({ category => 'PA_CLASS', authorised_value => $class });
+ my $lib = $av->count ? $av->next->lib : $class;
push @attributes_loop, {
class => $class,
items => \@items,
lib => $lib,
+ branches => $branches,
};
}
$template->param(available_attribute_types => \@attributes_loop);
$template->param(display_list => 1);
}
-
-sub authorised_value_category_list {
- my $template = shift;
- my $selected = @_ ? shift : '';
-
- my $categories = GetAuthorisedValueCategories();
- my @list = ();
- foreach my $category (@$categories) {
- my $entry = { category => $category };
- $entry->{selected} = 1 if $category eq $selected;
- push @list, $entry;
- }
- $template->param(authorised_value_categories => \@list);
-}
-
-sub pa_classes {
- my $template = shift;
- my $selected = @_ ? shift : '';
-
- $template->param(classes_val_loop => GetAuthorisedValues( 'PA_CLASS', $selected ) );
-}
projects / koha.git / blobdiff