[38/40] Misc bugfixs

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-batches-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-batches-toolbar.inc
index b0bae2c..e139feb 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/labels-batches-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/labels-batches-toolbar.inc
@@ -1,6 +1,16 @@
 <div id="toolbar">
     <script type="text/JavaScript">
         //<![CDATA[
+           function DeleteConfirm() {
+                var msg = "Are you sure you want to delete batch <!-- TMPL_VAR NAME="batch_id" -->?"
+                var answer = confirm(msg);
+                if (answer) {
+                    window.location = "/cgi-bin/koha/labels/label-manage.pl?op=delete&amp;label_element=batch&amp;element_id=<!-- TMPL_VAR NAME="batch_id" -->";
+                }
+                else {
+                    return; // abort delete
+                }
+            };
             function Remove() {
                 items = new Array;
                 item_num = new Array;
@@ -93,6 +103,7 @@
          $(document).ready(function() {
             $("#additemsc").empty();
             $("#removeitemsc").empty();
+            $("#deletebatchc").empty();
             $("#deduplicatec").empty();
             $("#exportitemsc").empty();
             $("#exportbatchc").empty();
@@ -118,6 +129,15 @@
                 onclick: {fn:function(){Remove()}}
             });
 
+            new YAHOO.widget.Button({
+                id: "deletebatch", 
+                type: "link", 
+                href: "#",
+                label: _("Delete Batch"), 
+                container: "deletebatchc",
+                onclick: {fn:function(){DeleteConfirm()}}
+            });
+
             new YAHOO.widget.Button({
                 id: "deduplicate", 
                 type: "link", 
@@ -151,8 +171,7 @@
     <ul class="toolbar">
         <li id="additemsc"><a id="additems" href="#">Add Item(s)</a></li>
         <li id="removeitemsc"><a id="removeitems" href="#">Remove Item(s)</a></li>
-        <li><a id="deletebatch" href="/cgi-bin/koha/labels/label-manage.pl?op=delete&amp;label_element=batch&amp;element_id=<!-- TMPL_VAR NAME="batch_id" -->">Delete Batch</a></li>
-                                <!-- FIXME: should use POST to change server state, not GET -->
+        <li id="deletebatchc"><a id="deletebatch" href="#">Delete Batch</a></li>
         <li id="deduplicatec"><a id="deduplicate" href="#">Remove Duplicates</a></li>
         <li id="exportitemsc"><a id="exportitems" href="#">Export Item(s)</a></li>
         <li id="exportbatchc"><a id="exportbatch" href="#">Export Batch</a></li>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl
index 5981dbc..17ba3f8 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-edit-layout.tmpl
@@ -4,11 +4,11 @@
     <script type="text/JavaScript" language="JavaScript">
         //<![CDATA[
             $(document).ready(function() {
-                $("input[@name='layout_choice']").change( function() { layout_method() } );
+                $("input[name='layout_choice']").change( function() { layout_method() } );
                 layout_method();
             });
             function layout_method() {
-                if( $("input[@name='layout_choice']:checked").val() == 'layout_string' ) {
+                if( $("input[name='layout_choice']:checked").val() == 'layout_string' ) {
                     $('#layout_table').hide();
                     $('#layout_string').show();
                 } else {

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl
index 92bc2e5..19db05c 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/result.tmpl
@@ -2,7 +2,7 @@
     <title>Koha &rsaquo; Barcodes and Labels &rsaquo; Search Results</title>
     <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
     <style type="text/css">#custom-doc { width:46.23em;*width:45.04em;min-width:700px; margin:auto;margin-top: .4em; text-align:left; }</style>
-    <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.checkboxes.pack.js"></script>
+    <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
     <script type="text/javascript">
         //<![CDATA[
             $(document).ready(function(){

diff --git a/t/db_dependent/Labels/t_Profile.t b/t/db_dependent/Labels/t_Profile.t
index ee15e2d..c1e921d 100644 (file)
--- a/t/db_dependent/Labels/t_Profile.t
+++ b/t/db_dependent/Labels/t_Profile.t
@@ -92,4 +92,4 @@ is_deeply($updated_profile, $saved_profile) || diag "Updated layout object FAILE
 diag "Testing Profile->delete() method.";
 
 my $del_results = $updated_profile->delete();
-ok($del_results eq 0) || diag "Profile->delete() FAILED. See syslog for details.";
+ok($del_results ne -1) || diag "Profile->delete() FAILED. See syslog for details.";