# along with Koha; if not, see <http://www.gnu.org/licenses>.
use Modern::Perl;
+
use CGI qw ( -utf8 );
+use Try::Tiny;
+
use C4::Auth;
use C4::Context;
use C4::Output;
use C4::Koha;
+
+use Koha::Database;
use Koha::Patrons;
use Koha::Items;
use Koha::Libraries;
-use Koha::LibraryCategories;
+use Koha::SMTP::Servers;
-my $input = new CGI;
+my $input = CGI->new;
my $branchcode = $input->param('branchcode');
my $categorycode = $input->param('categorycode');
my $op = $input->param('op') || 'list';
{ template_name => "admin/branches.tt",
query => $input,
type => "intranet",
- authnotrequired => 0,
- flagsrequired => { parameters => 'parameters_remaining_permissions' },
+ flagsrequired => { parameters => 'manage_libraries' },
debug => 1,
}
);
my $library;
if ($branchcode) {
$library = Koha::Libraries->find($branchcode);
+ $template->param( selected_smtp_server => $library->smtp_server );
}
+ my @smtp_servers = Koha::SMTP::Servers->search;
+
$template->param(
- library => $library,
- categories => [ Koha::LibraryCategories->search( {}, { order_by => [ 'categorytype', 'categoryname' ] } ) ],
- $library ? ( selected_categorycodes => [ map { $_->categorycode } $library->get_categories ] ) : (),
+ library => $library,
+ smtp_servers => \@smtp_servers
);
} elsif ( $op eq 'add_validate' ) {
my @fields = qw(
branchip
branchnotes
opac_info
+ marcorgcode
+ pickup_location
);
my $is_a_modif = $input->param('is_a_modif');
- my @categories;
- for my $category ( Koha::LibraryCategories->search ) {
- push @categories, $category
- if $input->param( "selected_categorycode_" . $category->categorycode );
- }
if ($is_a_modif) {
my $library = Koha::Libraries->find($branchcode);
for my $field (@fields) {
- $library->$field( $input->param($field) );
+ $library->$field( scalar $input->param($field) );
}
- $library->update_categories( \@categories );
- eval { $library->store; };
- if ($@) {
+ try {
+ Koha::Database->new->schema->txn_do(
+ sub {
+ $library->store->discard_changes;
+ # Deal with SMTP server
+ my $smtp_server_id = $input->param('smtp_server');
+
+ if ( $smtp_server_id ) {
+ if ( $smtp_server_id eq '*' ) {
+ $library->smtp_server({ smtp_server => undef });
+ }
+ else {
+ my $smtp_server = Koha::SMTP::Servers->find( $smtp_server_id );
+ Koha::Exceptions::BadParameter->throw( parameter => 'smtp_server' )
+ unless $smtp_server;
+ $library->smtp_server({ smtp_server => $smtp_server });
+ }
+ }
+
+ push @messages, { type => 'message', code => 'success_on_update' };
+ }
+ );
+ }
+ catch {
push @messages, { type => 'alert', code => 'error_on_update' };
- } else {
- push @messages, { type => 'message', code => 'success_on_update' };
}
} else {
$branchcode =~ s|\s||g;
my $library = Koha::Library->new(
{ branchcode => $branchcode,
- ( map { $_ => $input->param($_) || undef } @fields )
+ ( map { $_ => scalar $input->param($_) || undef } @fields )
}
);
- eval { $library->store; };
- $library->add_to_categories( \@categories );
- if ($@) {
- push @messages, { type => 'alert', code => 'error_on_insert' };
- } else {
- push @messages, { type => 'message', code => 'success_on_insert' };
+
+ try {
+ Koha::Database->new->schema->txn_do(
+ sub {
+ $library->store->discard_changes;
+
+ my $smtp_server_id = $input->param('smtp_server');
+
+ if ( $smtp_server_id ) {
+ if ( $smtp_server_id ne '*' ) {
+ my $smtp_server = Koha::SMTP::Servers->find( $smtp_server_id );
+ Koha::Exceptions::BadParameter->throw( parameter => 'smtp_server' )
+ unless $smtp_server;
+ $library->smtp_server({ smtp_server => $smtp_server });
+ }
+ }
+
+ push @messages, { type => 'message', code => 'success_on_insert' };
+ }
+ );
}
+ catch {
+ push @messages, { type => 'alert', code => 'error_on_insert' };
+ };
}
$op = 'list';
} elsif ( $op eq 'delete_confirm' ) {
push @messages, { type => 'message', code => 'success_on_delete' };
}
$op = 'list';
-} elsif ( $op eq 'add_form_category' ) {
- my $category;
- if ($categorycode) {
- $category = Koha::LibraryCategories->find($categorycode);
- }
- $template->param( category => $category, );
-} elsif ( $op eq 'add_validate_category' ) {
- my $is_a_modif = $input->param('is_a_modif');
- my @fields = qw(
- categoryname
- codedescription
- categorytype
- );
- if ($is_a_modif) {
- my $category = Koha::LibraryCategories->find($categorycode);
- for my $field (@fields) {
- $category->$field( $input->param($field) );
- }
- $category->show_in_pulldown( $input->param('show_in_pulldown') eq 'on' );
- eval { $category->store; };
- if ($@) {
- push @messages, { type => 'alert', code => 'error_on_update_category' };
- } else {
- push @messages, { type => 'message', code => 'success_on_update_category' };
- }
- } else {
- my $category = Koha::LibraryCategory->new(
- { categorycode => $categorycode,
- ( map { $_ => $input->param($_) || undef } @fields )
- }
- );
- $category->show_in_pulldown( $input->param('show_in_pulldown') eq 'on' );
- eval { $category->store; };
- if ($@) {
- push @messages, { type => 'alert', code => 'error_on_insert_category' };
- } else {
- push @messages, { type => 'message', code => 'success_on_insert_category' };
- }
- }
- $op = 'list';
-} elsif ( $op eq 'delete_confirm_category' ) {
- my $category = Koha::LibraryCategories->find($categorycode);
- if ( my $libraries_count = $category->libraries->count ) {
- push @messages,
- { type => 'alert',
- code => 'cannot_delete_category',
- data => { libraries_count => $libraries_count, },
- };
- $op = 'list';
- } else {
- $template->param( category => $category );
- }
-} elsif ( $op eq 'delete_confirmed_category' ) {
- my $category = Koha::LibraryCategories->find($categorycode);
- my $deleted = eval { $category->delete; };
-
- if ( $@ or not $deleted ) {
- push @messages, { type => 'alert', code => 'error_on_delete_category' };
- } else {
- push @messages, { type => 'message', code => 'success_on_delete_category' };
- }
- $op = 'list';
} else {
$op = 'list';
}
-if ( $op eq 'list' ) {
- my $libraries = Koha::Libraries->search( {}, { order_by => ['branchcode'] }, );
- $template->param(
- libraries => $libraries,
- group_types => [
- { categorytype => 'searchdomain',
- categories => [ Koha::LibraryCategories->search( { categorytype => 'searchdomain' } ) ],
- },
- { categorytype => 'properties',
- categories => [ Koha::LibraryCategories->search( { categorytype => 'properties' } ) ],
- },
- ]
- );
-}
+$template->param( libraries_count => Koha::Libraries->search->count )
+ if $op eq 'list';
$template->param(
messages => \@messages,
projects / srvgit / blobdiff