Attachment 50954 Details for Bug 11297 – Bug 11297: QA follow-up - Some fixes

[patch] Bug 11297: QA follow-up - Some fixes

Bug-11297-QA-follow-up---Some-fixes.patch (text/plain), 2.81 KB, created by Katrin Fischer on 2016-04-28 20:45:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2016-04-28 20:45:18 UTC

Size: 2.81 KB

patch

obsolete

>From 46ec121bdc244bc968febb3a2e10abc07e49a6ac Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <Katrin.Fischer.83@web.de>
>Date: Thu, 28 Apr 2016 22:43:32 +0200
>Subject: [PATCH] Bug 11297: QA follow-up - Some fixes
>
>- Makes Attributes only show up when adding a new Z39.50 server,
>  not for SRU
>- Fixes typo in db documentation
>- Fixes sorting of table columns
>---
> installer/data/mysql/kohastructure.sql                        | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt | 5 +++--
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
>diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
>index 57d5bd8..bdbec11 100644
>--- a/installer/data/mysql/kohastructure.sql
>+++ b/installer/data/mysql/kohastructure.sql
>@@ -2454,7 +2454,7 @@ CREATE TABLE `z3950servers` ( -- connection information for the Z39.50 targets u
>   `sru_options` varchar(255) default NULL, -- options like sru=get, sru_version=1.1; will be passed to the server via ZOOM
>   `sru_fields` mediumtext default NULL, -- contains the mapping between the Z3950 search fields and the specific SRU server indexes
>   `add_xslt` mediumtext default NULL, -- zero or more paths to XSLT files to be processed on the search results
>-  `attributes` VARCHAR(255) default NULL, -- additionnal attributes passed to PQF queries
>+  `attributes` VARCHAR(255) default NULL, -- additional attributes passed to PQF queries
>   PRIMARY KEY  (`id`)
> ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
>index 71871bc..8f59cb4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tt
>@@ -65,7 +65,7 @@
>     $(document).ready(function() {
>         $("#serverst").dataTable($.extend(true, {}, dataTablesDefaults, {
>             "aoColumnDefs": [
>-                { "aTargets": [2,3,4,7,8,9,10,11], "bSortable": false, "bSearchable": false },
>+                { "aTargets": [-1], "bSortable": false, "bSearchable": false },
>             ],
>             "sPaginationType": "four_button"
>         }));
>@@ -143,9 +143,10 @@
>         </li>
>         <li><label for="rank">Rank (display order): </label> <input type="text" name="rank" id="rank" size="4" value="[% server.rank %]" />
>         </li>
>+        [% IF (server.servertype||type) == 'zed' %]
>         <li><label for="attributes">Attributes (additional PQF attributes added to each query): </label><input type="text" name="attributes" id="attributes" size="30" value="[% server.attributes %]" />
>         </li>
>-
>+        [% END %]
> 
>         <li><label for="syntax">Syntax (z3950 can send<br /> records in various format. Choose one): </label>
>         <select name="syntax" id="syntax">
>-- 
>1.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 11297: 23144 | 23145 | 40829 | 40889 | 48649 | 50415 | 50416 | 50420 | 50954 | 59448 | 62938 | 62939 | 70190 | 70191 | 70192 | 70193 | 70194 | 70195 | 70196 | 71992 | 71993 | 71994 | 72061 | 72062 | 72063 | 77718 | 77719 | 77720 | 77721 | 77722 | 77723 | 78294 | 78295 | 78296 | 78297 | 80372 | 80496 | 80497 | 80498 | 80499 | 81328 | 81342 | 81343 | 81344 | 81345 | 81346 | 92719 | 92720 | 92721 | 92722 | 98598 | 98599 | 98600 | 98601 | 99227 | 99228 | 99229 | 99230 | 99231