Bugzilla – Attachment 7325 Details for
Bug 1633
Add ability to take book cover images from local img db
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 1633 follow-up: Fix jenkins tests
Bug-1633-follow-up-Fix-jenkins-tests.patch (text/plain), 8.46 KB, created by
Chris Cormack
on 2012-01-24 19:30:48 UTC
(
hide
)
Description:
Bug 1633 follow-up: Fix jenkins tests
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2012-01-24 19:30:48 UTC
Size:
8.46 KB
patch
obsolete
>From d371289d4e664d0dc0c492ce40b82be98c900682 Mon Sep 17 00:00:00 2001 >From: Jared Camins-Esakov <jcamins@cpbibliography.com> >Date: Tue, 24 Jan 2012 08:41:01 -0500 >Subject: [PATCH] Bug 1633 follow-up: Fix jenkins tests > >The previous patches missed adding the upload_local_cover_images permission to >languages other than en, and used a forbidden TT construct, giving jenkins >agitas and indigestion. This patch adds the permission to other languages and >corrects the syntax. > >Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> >--- > .../data/mysql/de-DE/mandatory/userpermissions.sql | 1 + > .../mysql/fr-FR/1-Obligatoire/userpermissions.sql | 1 + > .../data/mysql/it-IT/necessari/userpermissions.sql | 1 + > installer/data/mysql/kohastructure.sql | 2 +- > .../data/mysql/pl-PL/mandatory/userpermissions.sql | 1 + > .../ru-RU/mandatory/permissions_and_user_flags.sql | 1 + > .../uk-UA/mandatory/permissions_and_user_flags.sql | 1 + > .../prog/en/modules/tools/upload-images.tt | 6 +++--- > 8 files changed, 10 insertions(+), 4 deletions(-) > >diff --git a/installer/data/mysql/de-DE/mandatory/userpermissions.sql b/installer/data/mysql/de-DE/mandatory/userpermissions.sql >index d0d40fd..2302273 100644 >--- a/installer/data/mysql/de-DE/mandatory/userpermissions.sql >+++ b/installer/data/mysql/de-DE/mandatory/userpermissions.sql >@@ -36,6 +36,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES > (13, 'manage_csv_profiles', 'CSV-Profile für Export verwalten'), > (13, 'moderate_tags', 'Von Benutzern vergebene Tags moderieren'), > (13, 'rotating_collections', 'Wandernde Sammlungen verwalten'), >+ (13, 'upload_local_cover_images', 'Upload local cover images'), > (15, 'check_expiration', 'Ablauf eines Abonnements prüfen'), > (15, 'claim_serials', 'Fehlende Hefte reklamieren'), > (15, 'create_subscription', 'Neues Abonnement anlegen'), >diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql b/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql >index 347d3ec..10a92f7 100644 >--- a/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql >+++ b/installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql >@@ -36,6 +36,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES > (13, 'rotating_collections', 'Gérer les collections tournantes'), > (13, 'items_batchmod', 'Modifier les exemplaires par lot'), > (13, 'items_batchdel', 'Supprimer les exemplaires par lot'), >+ (13, 'upload_local_cover_images', 'Upload local cover images'), > (15, 'check_expiration', 'Contrôler l''expiration d''un périodique'), > (15, 'claim_serials', 'Réclamer les périodiques manquants'), > (15, 'create_subscription', 'Créer de nouveaux abonnements'), >diff --git a/installer/data/mysql/it-IT/necessari/userpermissions.sql b/installer/data/mysql/it-IT/necessari/userpermissions.sql >index 63761df..926b47c 100644 >--- a/installer/data/mysql/it-IT/necessari/userpermissions.sql >+++ b/installer/data/mysql/it-IT/necessari/userpermissions.sql >@@ -38,6 +38,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES > (13, 'manage_csv_profiles', 'Gestisci i profili CSV di export'), > (13, 'moderate_tags', 'Modera i tag inseriti dagli utenti'), > (13, 'rotating_collections', 'Gestisci le collezioni circolanti (rotating collections)'), >+ (13, 'upload_local_cover_images', 'Upload local cover images'), > (15, 'check_expiration', 'Controlla la scadenza di una risora in continuazione'), > (15, 'claim_serials', 'Richiedi i fascicoli non arrivati'), > (15, 'create_subscription', 'Crea un nuovo abbonamento'), >diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql >index 336aaa1..37113c2 100644 >--- a/installer/data/mysql/kohastructure.sql >+++ b/installer/data/mysql/kohastructure.sql >@@ -2684,7 +2684,7 @@ CREATE TABLE `bibliocoverimage` ( > `thumbnail` mediumblob NOT NULL, > PRIMARY KEY (`imagenumber`), > CONSTRAINT `bibliocoverimage_fk1` FOREIGN KEY (`biblionumber`) REFERENCES `biblio` (`biblionumber`) ON DELETE CASCADE ON UPDATE CASCADE >-) ENGINE=InnoDB DEFAULT CHARSET=utf8 >+) ENGINE=InnoDB DEFAULT CHARSET=utf8; > > /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; > /*!40101 SET SQL_MODE=@OLD_SQL_MODE */; >diff --git a/installer/data/mysql/pl-PL/mandatory/userpermissions.sql b/installer/data/mysql/pl-PL/mandatory/userpermissions.sql >index acb4ddf..f16a14d 100644 >--- a/installer/data/mysql/pl-PL/mandatory/userpermissions.sql >+++ b/installer/data/mysql/pl-PL/mandatory/userpermissions.sql >@@ -37,6 +37,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES > (13, 'moderate_tags', 'Moderate patron tags'), > (16, 'execute_reports', 'Execute SQL reports'), > (13, 'rotating_collections', 'Manage rotating collections'), >+ (13, 'upload_local_cover_images', 'Upload local cover images'), > (15, 'check_expiration', 'Check the expiration of a serial'), > (15, 'claim_serials', 'Claim missing serials'), > (15, 'create_subscription', 'Create a new subscription'), >diff --git a/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql b/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql >index 6f4ed1b..760b810 100644 >--- a/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql >+++ b/installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql >@@ -60,6 +60,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES > (13, 'manage_csv_profiles', 'Manage CSV export profiles'), > (13, 'moderate_tags', 'Moderate patron tags'), > (13, 'rotating_collections', 'Manage rotating collections'), >+ (13, 'upload_local_cover_images', 'Upload local cover images'), > (15, 'check_expiration', 'Check the expiration of a serial'), > (15, 'claim_serials', 'Claim missing serials'), > (15, 'create_subscription', 'Create a new subscription'), >diff --git a/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql b/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql >index f12ad37..8739379 100644 >--- a/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql >+++ b/installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql >@@ -60,6 +60,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES > (13, 'manage_csv_profiles', 'Manage CSV export profiles'), > (13, 'moderate_tags', 'Moderate patron tags'), > (13, 'rotating_collections', 'Manage rotating collections'), >+ (13, 'upload_local_cover_images', 'Upload local cover images'), > (15, 'check_expiration', 'Check the expiration of a serial'), > (15, 'claim_serials', 'Claim missing serials'), > (15, 'create_subscription', 'Create a new subscription'), >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >index 26a1468..6108b3d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt >@@ -93,11 +93,11 @@ function CheckForm(f) { > <legend>File type</legend> > <ol> > <li class="radio"> >- <input type="radio" id="zipfile" name="filetype" value="zip" [% IF (filetype != 'image' ) %]checked="checked"[% END %] /> >+ [% IF (filetype != 'image' ) %]<input type="radio" id="zipfile" name="filetype" value="zip" checked="checked" />[% ELSE %]<input type="radio" id="zipfile" name="filetype" value="zip" />[% END %] > <label for="zipfile">ZIP file</label> > </li> > <li class="radio"> >- <input type="radio" id="image" name="filetype" value="image" [% IF (filetype == 'image' ) %]checked="checked"[% END %] /> >+ [% IF (filetype == 'image' ) %]<input type="radio" id="image" name="filetype" value="image" checked="checked" />[% ELSE %]<input type="radio" id="image" name="filetype" value="image" />[% END %] > <label for="imagefile">Image file</label> > </li> > <li class="radio"> >@@ -109,7 +109,7 @@ function CheckForm(f) { > <legend>Options</legend> > <ol> > <li class="checkbox"> >- <input type="checkbox" id="replace" name="replace" [% IF AllowMultipleCovers == 0 %]checked="checked" disabled="disabled"[% END %] value="1" /> >+ [% IF AllowMultipleCovers == 0 %]<input type="checkbox" id="replace" name="replace" checked="checked" disabled="disabled" value="1" />[% ELSE %]<input type="checkbox" id="replace" name="replace" value="1" />[% END %] > <label for="replace">Replace existing covers</label> > </li> > </ol> >-- >1.7.5.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 1633
:
6242
|
6699
|
6706
|
6712
|
6745
|
6746
|
6747
|
6748
|
6749
|
6750
|
6755
|
6756
|
6758
|
6759
|
6764
|
6765
|
6766
|
6785
|
6786
|
6787
|
6788
|
6791
|
6823
|
6973
|
6974
|
6975
|
6976
|
6977
|
6978
|
6979
|
6980
|
6981
|
6982
|
6983
|
7146
|
7147
|
7148
|
7149
|
7150
|
7151
|
7152
|
7153
|
7156
|
7219
|
7267
|
7268
|
7270
|
7271
|
7272
|
7273
|
7274
|
7275
|
7312
|
7315
|
7320
|
7324
| 7325 |
7334