gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Jared Camins-Esakov 2012-01-24 08:41:01 -05:00 committed by Paul Poulain
parent 43a46c507e
commit 75eddb9cee
8 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
installer/data/mysql/de-DE/mandatory/userpermissions.sql
View File

@ -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'),

1
installer/data/mysql/fr-FR/1-Obligatoire/userpermissions.sql
View File

@ -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'),

1
installer/data/mysql/it-IT/necessari/userpermissions.sql
View File

@ -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'),

2
installer/data/mysql/kohastructure.sql
View File

@ -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 */;

1
installer/data/mysql/pl-PL/mandatory/userpermissions.sql
View File

@ -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'),

1
installer/data/mysql/ru-RU/mandatory/permissions_and_user_flags.sql
View File

@ -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'),

1
installer/data/mysql/uk-UA/mandatory/permissions_and_user_flags.sql
View File

@ -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'),

6
koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
View File

@ -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>