[5/30] A rework of Label Creator code

[koha.git] / labels / label-edit-layout.pl

diff --git a/labels/label-edit-layout.pl b/labels/label-edit-layout.pl
index 5bb8fc6..9b41e4a 100755 (executable)
--- a/labels/label-edit-layout.pl
+++ b/labels/label-edit-layout.pl
@@ -27,7 +27,7 @@ use Text::CSV_XS;
 
 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_barcode_types get_label_types get_font_types get_text_justification_types);
+use C4::Creators::Lib 1.000000 qw(get_barcode_types get_label_types get_font_types get_text_justification_types);
 use C4::Labels::Layout 1.000000;
 
 my $cgi = new CGI;
@@ -135,13 +135,13 @@ elsif  ($op eq 'save') {
     if ($layout_id) {   # if a label_id was passed in, this is an update to an existing layout
         $layout = C4::Labels::Layout->retrieve(layout_id => $layout_id);
         $layout->set_attr(@params);
-        $layout->save();
+        $layout_id = $layout->save();
     }
     else {      # if no label_id, this is a new layout so insert it
         $layout = C4::Labels::Layout->new(@params);
-        $layout->save();
+        $layout_id = $layout->save();
     }
-    print $cgi->redirect("label-manage.pl?label_element=layout");
+    print $cgi->redirect("label-manage.pl?label_element=layout" . ($layout_id == -1 ? "&element_id=$layout_id&op=$op&error=1" : ''));
     exit;
 }
 else {  # if we get here, this is a new layout