Bringing label, patroncard, and creator modules into conformity with the rest of...

[srvgit] / labels / label-edit-template.pl

diff --git a/labels/label-edit-template.pl b/labels/label-edit-template.pl
index 81443d6..7a245b3 100755 (executable)
--- a/labels/label-edit-template.pl
+++ b/labels/label-edit-template.pl
@@ -4,7 +4,7 @@
 # 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
@@ -22,12 +22,11 @@ use strict;
 use warnings;
 
 use CGI;
-use HTML::Template::Pro;
 
 use C4::Auth qw(get_template_and_user);
 use C4::Output qw(output_html_with_http_headers);
-use C4::Labels::Lib 1.000000 qw(get_all_profiles get_unit_values);
-use C4::Labels::Template 1.000000;
+use C4::Creators 1.000000;
+use C4::Labels 1.000000;
 
 my $cgi = new CGI;
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -42,6 +41,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 );
 
 my $op = $cgi->param('op');
+warn "operation = $op\n";
 my $template_id = $cgi->param('template_id') || $cgi->param('element_id');
 my $label_template = undef;
 my $profile_list = undef;
@@ -72,23 +72,40 @@ elsif ($op eq 'save') {
                         );
     if ($template_id) {   # if a label_id was passed in, this is an update to an existing layout
         $label_template = C4::Labels::Template->retrieve(template_id => $template_id);
-        my $old_profile = C4::Labels::Profile->retrieve(profile_id => $label_template->get_attr('profile_id'));
-        my $new_profile = C4::Labels::Profile->retrieve(profile_id => $cgi->param('profile_id'));
-        if ($label_template->get_attr('template_id') != $new_profile->get_attr('template_id')) {
+        if ($cgi->param('profile_id') && ($label_template->get_attr('template_id') != $cgi->param('profile_id'))) {
+            if ($label_template->get_attr('profile_id') > 0) {   # no need to get the old one if there was no profile associated
+                my $old_profile = C4::Labels::Profile->retrieve(profile_id => $label_template->get_attr('profile_id'));
+                $old_profile->set_attr(template_id => 0);
+                $old_profile->save();
+            }
+            my $new_profile = C4::Labels::Profile->retrieve(profile_id => $cgi->param('profile_id'));
             $new_profile->set_attr(template_id => $label_template->get_attr('template_id'));
-            $old_profile->set_attr(template_id => 0);
             $new_profile->save();
-            $old_profile->save();
         }
+
+#        if ($cgi->param('profile_id')) {
+#            my $old_profile = ($label_template->get_attr('profile_id') ? C4::Labels::Profile->retrieve(profile_id => $label_template->get_attr('profile_id')) : undef);
+#            my $new_profile = C4::Labels::Profile->retrieve(profile_id => $cgi->param('profile_id'));
+#            if ($label_template->get_attr('template_id') != $new_profile->get_attr('template_id')) {
+#                $new_profile->set_attr(template_id => $label_template->get_attr('template_id'));
+#                $new_profile->save();
+#                if ($old_profile) {
+#                    $old_profile->set_attr(template_id => 0);
+#                    $old_profile->save();
+#                }
+#            }
+#        }
         $label_template->set_attr(@params);
         $label_template->save();
     }
     else {      # if no label_id, this is a new layout so insert it
         $label_template = C4::Labels::Template->new(@params);
         my $template_id = $label_template->save();
-        my $profile = C4::Labels::Profile->retrieve(profile_id => $cgi->param('profile_id'));
-        $profile->set_attr(template_id => $template_id) if $template_id != $profile->get_attr('template_id');
-        $profile->save();
+        if ($cgi->param('profile_id')) {
+            my $profile = C4::Labels::Profile->retrieve(profile_id => $cgi->param('profile_id'));
+            $profile->set_attr(template_id => $template_id) if $template_id != $profile->get_attr('template_id');
+            $profile->save();
+        }
     }
     print $cgi->redirect("label-manage.pl?label_element=template");
     exit;