projects
/
koha.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 12973: Allow passing code to XSLT_Handler instead of filename
[koha.git]
/
labels
/
label-manage.pl
diff --git
a/labels/label-manage.pl
b/labels/label-manage.pl
index
70302e8
..
4ee8779
100755
(executable)
--- a/
labels/label-manage.pl
+++ b/
labels/label-manage.pl
@@
-22,19
+22,18
@@
use strict;
use warnings;
use vars qw($debug);
use warnings;
use vars qw($debug);
-use CGI;
+use CGI
qw ( -utf8 )
;
use Data::Dumper;
use C4::Auth qw(get_template_and_user);
use C4::Output qw(output_html_with_http_headers);
use Data::Dumper;
use C4::Auth qw(get_template_and_user);
use C4::Output qw(output_html_with_http_headers);
-use autouse 'C4::Branch' => qw(get_branch_code_from_name);
-use C4::Creators 1.000000;
-use C4::Labels 1.000000;
+use C4::Creators;
+use C4::Labels;
my $cgi = new CGI;
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
my $cgi = new CGI;
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
- template_name => "labels/label-manage.t
mpl
",
+ template_name => "labels/label-manage.t
t
",
query => $cgi,
type => "intranet",
authnotrequired => 0,
query => $cgi,
type => "intranet",
authnotrequired => 0,
@@
-74,7
+73,7
@@
my $op = $cgi->param('op') || 'none';
my $element_id = $cgi->param('element_id') || undef;
my $error = $cgi->param('error') || 0;
my $element_id = $cgi->param('element_id') || undef;
my $error = $cgi->param('error') || 0;
-my $branch_code = ($label_element eq 'batch' ?
get_branch_code_from_name($template->{VARS}->{'LoginBranchname'})
: '');
+my $branch_code = ($label_element eq 'batch' ?
C4::Context->userenv->{'branch'}
: '');
if ($op eq 'delete') {
if ($label_element eq 'layout') {$error = C4::Labels::Layout::delete(layout_id => $element_id);}
if ($op eq 'delete') {
if ($label_element eq 'layout') {$error = C4::Labels::Layout::delete(layout_id => $element_id);}
@@
-99,12
+98,6
@@
$template->param(
element_id => $element_id,
table_loop => $table,
label_element => $label_element,
element_id => $element_id,
table_loop => $table,
label_element => $label_element,
- label_element_title => ($label_element eq 'layout' ? 'Layouts' :
- $label_element eq 'template' ? 'Templates' :
- $label_element eq 'profile' ? 'Profiles' :
- $label_element eq 'batch' ? 'Batches' :
- ''
- ),
);
output_html_with_http_headers $cgi, $cookie, $template->output;
);
output_html_with_http_headers $cgi, $cookie, $template->output;