Attachment 76036 Details for Bug 17698 – Bug 17698: (QA follow-up) few more things

[patch] Bug 17698: (QA follow-up) few more things

Bug-17698-QA-follow-up-few-more-things.patch (text/plain), 3.47 KB, created by Jonathan Druart on 2018-06-13 15:24:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2018-06-13 15:24:37 UTC

Size: 3.47 KB

patch

obsolete

>From ee650be8f0891751204227f1b54795c778af3d6f Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Wed, 13 Jun 2018 10:18:17 -0300
>Subject: [PATCH] Bug 17698: (QA follow-up) few more things
>
>1. body tag was missing
>2. make "Date" column sortable correctly
>3. remove CDATA and type="text/javascript"
>4. Handle server-side errors
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> .../intranet-tmpl/prog/en/modules/circ/checkout-notes.tt | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt
>index ae954ca131..4b99a49cb4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/checkout-notes.tt
>@@ -8,6 +8,9 @@
> [% INCLUDE 'doc-head-close.inc' %]
> [% Asset.css("css/datatables.css") %]
> </head>
>+
>+<body id="circ_checkout-notes" class="circ">
>+
> [% INCLUDE 'header.inc' %]
> [% INCLUDE 'circ-search.inc' %]
> <div id="breadcrumbs">
>@@ -58,7 +61,7 @@
>                                 <th>&nbsp;</th>
>                                 <th>Title</th>
>                                 <th>Note</th>
>-                                <th>Date</th>
>+                                <th class="title-string">Date</th>
>                                 <th>Set by</th>
>                                 <th>Status</th>
>                                 <th>Actions</th>
>@@ -70,7 +73,7 @@
>                                     <td><input type="checkbox" name="issue_ids" value="[% note.issue_id %]"></td>
>                                     <td>[% note.item.biblio.title %] - [% note.item.biblio.author %] (<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% note.item.biblionumber %]">[% note.item.barcode %]</a>)</td>
>                                     <td>[% note.note | html %]</td>
>-                                    <td>[% note.notedate | $KohaDates %]</td>
>+                                    <td><span title="[% note.notedate %]">[% note.notedate | $KohaDates %]</span></td>
>                                     <td>[% INCLUDE 'patron-title.inc' patron => note.patron hide_patron_infos_if_needed=1 %]</td>
>                                     <td class="seen[% note.noteseen %]">
>                                         [% IF ( note.noteseen == 0 ) %]
>@@ -114,12 +117,12 @@
>     [% Asset.js("lib/jquery/plugins/jquery.checkboxes.min.js") %]
>     [% INCLUDE 'calendar.inc' %]
>     [% INCLUDE 'datatables.inc' %]
>-    <script type="text/javascript">
>-    //<![CDATA[
>+    <script>
>         $(document).ready(function(){
>             $("#notestable").dataTable($.extend(true, {}, dataTablesDefaults, {
>                 "aoColumnDefs": [
>                     { "aTargets": [ 0, -1 ], "bSearchable": false, "bSortable": false },
>+                    { "sType": "title-string", "aTargets" : [ "title-string" ] },
>                 ],
>                 "sPaginationType": "four_button"
>             }));
>@@ -185,10 +188,13 @@
>                         $("#error").text(_("Unable to change status of note."));
>                         $("#error").show();
>                     }
>+                })
>+                .error(function(data){
>+                    $("#error").text(_("Unable to change status of note."));
>+                    $("#error").show();
>                 });
>             });
>         });
>-    //]]>
>     </script>
> [% END %]
> 
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 17698: 57851 | 58779 | 58780 | 58786 | 59480 | 59638 | 59762 | 59778 | 59809 | 59828 | 59829 | 59957 | 61857 | 62337 | 62351 | 64662 | 64683 | 64835 | 71100 | 71126 | 71127 | 72875 | 72876 | 72877 | 73004 | 73005 | 73006 | 73839 | 73840 | 73841 | 74044 | 74193 | 75837 | 75838 | 75839 | 75840 | 75841 | 75842 | 76011 | 76012 | 76028 | 76029 | 76030 | 76031 | 76032 | 76033 | 76034 | 76035 | 76036 | 76037 | 89964 | 90037