+
+
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tmpl
index d434495e3c..ece572e558 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manage.tmpl
@@ -6,7 +6,7 @@
function DeleteConfirm() {
var element_id = selected_layout();
if (element_id>-1) {
- var msg = "Are you sure you want to delete template " + element_id + "?"
+ var msg = "Are you sure you want to delete " + element_id + "?"
var answer = confirm(msg);
if (answer) {
window.location = "/cgi-bin/koha/labels/label-manage.pl?op=delete&label_element=&element_id=" + element_id;
diff --git a/labels/label-edit-profile.pl b/labels/label-edit-profile.pl
index 4643b1c9b2..e5d8bddb93 100755
--- a/labels/label-edit-profile.pl
+++ b/labels/label-edit-profile.pl
@@ -1,88 +1,107 @@
#!/usr/bin/perl
+#
+# Copyright 2006 Katipo Communications.
+# Parts Copyright 2009 Foundations Bible College.
+#
+# 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 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., 59 Temple Place,
+# Suite 330, Boston, MA 02111-1307 USA
use strict;
+use warnings;
+use Sys::Syslog qw(syslog);
use CGI;
-use C4::Auth;
-use C4::Context;
-use C4::Output;
-use C4::Labels;
use HTML::Template::Pro;
-use POSIX;
+use Data::Dumper;
-my $DEBUG = 0;
-my $dbh = C4::Context->dbh;
-my $query = new CGI;
-
-my $op = $query->param('op');
-my $prof_id = $query->param('prof_id');
-my $offset_horz = $query->param('offset_horz');
-my $offset_vert = $query->param('offset_vert');
-my $creep_horz = $query->param('creep_horz');
-my $creep_vert = $query->param('creep_vert');
-my $units = $query->param('unit');
+use C4::Auth;
+use C4::Output;
+use C4::Context;
+use C4::Debug;
+use C4::Labels::Lib 1.000000 qw(get_all_templates get_unit_values);
+use C4::Labels::Profile 1.000000;
+my $cgi = new CGI;
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
{
template_name => "labels/label-edit-profile.tmpl",
- query => $query,
+ query => $cgi,
type => "intranet",
- authnotrequired => 1,
+ authnotrequired => 0,
flagsrequired => { catalogue => 1 },
debug => 1,
}
);
+my $op = $cgi->param('op') || $ARGV[0] || '';
+my $profile_id = $cgi->param('profile_id') || $cgi->param('element_id') || $ARGV[1] || '';
+my $profile = '';
+my $template_list = '';
+my @label_template = ();
+my $units = get_unit_values();
-if ($op eq '' || undef) {
- my $prof = GetSinglePrinterProfile($prof_id);
-
- my $tmpl = GetSingleLabelTemplate($prof->{'tmpl_id'});
-
- if ( $DEBUG ) {
- use Data::Dumper;
- warn Dumper($prof);
- warn Dumper($tmpl);
- }
-
- my @units = (
- { unit => 'INCH', desc => 'Inches' },
- { unit => 'CM', desc => 'Centimeters' },
- { unit => 'MM', desc => 'Millimeters' },
- { unit => 'POINT', desc => 'Postscript Points' },
+if ($op eq 'edit') {
+ $profile = C4::Labels::Profile->retrieve(profile_id => $profile_id);
+ $template_list = get_all_templates(field_list => 'template_id,template_code, profile_id');
+}
+elsif ($op eq 'save') {
+ my @params = (
+ printer_name => $cgi->param('printer_name'),
+ paper_bin => $cgi->param('paper_bin'),
+ offset_horz => $cgi->param('offset_horz'),
+ offset_vert => $cgi->param('offset_vert'),
+ creep_horz => $cgi->param('creep_horz'),
+ creep_vert => $cgi->param('creep_vert'),
+ units => $cgi->param('units'),
);
-
- foreach my $unit (@units) {
- if ( $unit->{'unit'} eq $prof->{'unit'} ) {
- $unit->{'selected'} = 1;
- }
+ if ($profile_id) { # if a label_id was passed in, this is an update to an existing layout
+ $profile = C4::Labels::Profile->retrieve(profile_id => $profile_id);
+ $profile->set_attr(@params);
+ $profile->save();
}
-
- $template->param(
-
- units => \@units,
-
- prof_id => $prof->{'prof_id'},
- printername => $prof->{'printername'},
- paper_bin => $prof->{'paper_bin'},
- tmpl_code => $tmpl->{'tmpl_code'},
- prof_code => $prof->{'prof_code'},
- offset_horz => $prof->{'offset_horz'},
- offset_vert => $prof->{'offset_vert'},
- creep_horz => $prof->{'creep_horz'},
- creep_vert => $prof->{'creep_vert'},
- );
-}
-
-elsif ($op eq 'Save') {
- warn "Units are now $units";
-
- SaveProfile( $prof_id, $offset_horz, $offset_vert, $creep_horz, $creep_vert, $units );
- print $query->redirect("./label-profiles.pl");
+ else { # if no label_id, this is a new layout so insert it
+ $profile = C4::Labels::Profile->new(@params);
+ $profile->save();
+ }
+ print $cgi->redirect("label-manage.pl?label_element=profile");
exit;
}
-
-elsif ($op eq 'Cancel') {
- print $query->redirect("./label-profiles.pl");
- exit;
+else { # if we get here, this is a new layout
+ $profile = C4::Labels::Profile->new();
}
-output_html_with_http_headers $query, $cookie, $template->output;
+if ($profile_id) {
+ @label_template = grep{($_->{'profile_id'} == $profile->get_attr('profile_id')) && ($_->{'template_id'} == $profile->get_attr('template_id'))} @$template_list;
+}
+
+foreach my $unit (@$units) {
+ if ($unit->{'type'} eq $profile->get_attr('units')) {
+ $unit->{'selected'} = 1;
+ }
+}
+
+$template->param(profile_id => $profile->get_attr('profile_id')) if $profile->get_attr('profile_id') > 0;
+
+$template->param(
+ label_template => $label_template[0]->{'template_code'} || '',
+ printer_name => $profile->get_attr('printer_name'),
+ paper_bin => $profile->get_attr('paper_bin'),
+ offset_horz => $profile->get_attr('offset_horz'),
+ offset_vert => $profile->get_attr('offset_vert'),
+ creep_horz => $profile->get_attr('creep_horz'),
+ creep_vert => $profile->get_attr('creep_vert'),
+ units => $units,
+ op => $op,
+);
+
+output_html_with_http_headers $cgi, $cookie, $template->output;