Bugzilla – Attachment 24699 Details for
Bug 6254
Set default for privacy by patron category
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 6254: QA FIX: remove trailing whitespaces
Bug-6254-QA-FIX-remove-trailing-whitespaces.patch (text/plain), 1.96 KB, created by
Jonathan Druart
on 2014-01-24 14:58:10 UTC
(
hide
)
Description:
Bug 6254: QA FIX: remove trailing whitespaces
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2014-01-24 14:58:10 UTC
Size:
1.96 KB
patch
obsolete
>From a70ea57a8d0dbefe93dd0df506dae926dcd74942 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@biblibre.com> >Date: Fri, 24 Jan 2014 15:48:11 +0100 >Subject: [PATCH] Bug 6254: QA FIX: remove trailing whitespaces > >This patch removes trailing whitespaces/tab and fix the fields order in >the updatedb entry (according to the kohastructure.pl). > >Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> >--- > installer/data/mysql/updatedatabase.pl | 2 +- > koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > >diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl >index 678ca77..7d7bc1a 100755 >--- a/installer/data/mysql/updatedatabase.pl >+++ b/installer/data/mysql/updatedatabase.pl >@@ -7947,7 +7947,7 @@ if (CheckVersion($DBversion)) { > > $DBversion = "3.15.00.XXX"; > if(CheckVersion($DBversion)) { >- $dbh->do("ALTER TABLE categories ADD default_privacy ENUM( 'default', 'never', 'forever' ) NOT NULL DEFAULT 'default' AFTER categorycode"); >+ $dbh->do("ALTER TABLE categories ADD default_privacy ENUM( 'default', 'never', 'forever' ) NOT NULL DEFAULT 'default' AFTER category_type"); > print "Upgrade to $DBversion done (Bug 6254 - can't set patron privacy by default)\n"; > SetVersion($DBversion); > } >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt >index 5864f6a..f22941d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tt >@@ -247,7 +247,7 @@ > [% IF ( delete_confirm ) %] > <form action="[% script_name %]" method="post"> > <fieldset> >- <legend> >+ <legend> > [% IF ( patrons_in_category > 0 ) %] > Category [% categorycode |html %] is in use. Deletion not possible! > [% ELSE %] >-- >1.7.10.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 6254
:
19131
|
19132
|
19133
|
19272
|
19631
|
23309
|
23310
|
23317
|
23516
|
23520
|
23983
|
23985
|
23986
|
23987
|
24606
|
24696
|
24697
|
24698
|
24699
|
28033
|
28034
|
28035
|
28036