From ebd03e31e2a1cf2c30b97f2af48e283212d7a49a Mon Sep 17 00:00:00 2001 From: Ian Walls Date: Fri, 9 Sep 2011 11:17:19 -0400 Subject: [PATCH] Bug 6862: Duplicate VOKAL Book icons Removes duplicate VOKAL icons for Book.png and Book-32px.png. Database updated in both itemtypes and authorised_values tables to reflect change, so no icon loss should be seen Signed-off-by: Owen Leonard Signed-off-by: Chris Cormack --- installer/data/mysql/updatedatabase.pl | 10 ++++++++++ .../prog/img/itemtypeimg/vokal/BOOK-32px.png | Bin 897 -> 0 bytes .../prog/img/itemtypeimg/vokal/BOOK.png | Bin 3825 -> 0 bytes .../prog/itemtypeimg/vokal/BOOK-32px.png | Bin 897 -> 0 bytes .../opac-tmpl/prog/itemtypeimg/vokal/BOOK.png | Bin 3825 -> 0 bytes 5 files changed, 10 insertions(+) delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/vokal/BOOK-32px.png delete mode 100644 koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/vokal/BOOK.png delete mode 100644 koha-tmpl/opac-tmpl/prog/itemtypeimg/vokal/BOOK-32px.png delete mode 100644 koha-tmpl/opac-tmpl/prog/itemtypeimg/vokal/BOOK.png diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 080d2050cb..cfa9f4d8ce 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -4506,6 +4506,16 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion($DBversion); } +$DBversion = "3.05.00.XXX"; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do("UPDATE itemtypes SET imageurl = 'vokal/Book.png' WHERE imageurl = 'vokal/BOOK.png'"); + $dbh->do("UPDATE itemtypes SET imageurl = 'vokal/Book-32px.png' WHERE imageurl = 'vokal/BOOK-32px.png'"); + $dbh->do("UPDATE authorised_values SET imageurl = 'vokal/Book.png' WHERE imageurl = 'vokal/BOOK.png'"); + $dbh->do("UPDATE authorised_values SET imageurl = 'vokal/Book-32px.png' WHERE imageurl = 'vokal/BOOK-32px.png'"); + print "Upgrade to $DBversion done (remove duplicate VOKAL Book icons, bug 6862)\n"; + SetVersion($DBversion); +} + =head1 FUNCTIONS diff --git a/koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/vokal/BOOK-32px.png b/koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/vokal/BOOK-32px.png deleted file mode 100644 index c0aaad545f8be43e5010a2137f8cb92c51ce34b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 897 zcmV-{1AhF8P);S_31ODM1a z+cA<9k~Ri(MMCS+1sfI;7rqwg%9R2e!H}pcNi;FWg;D;3KR^@YQDdSD0=h7QU;`A8 z;*^JN+L`g*JJVui+F&(645vN0GxwhMeD|DhZohK6u46xq$3EL30P*2?uTR(1E2^eK z%VeObDpbuJbJxT*dasdDWAkhzuCZ&~bg)q+uB(7b_@$}Fnoic(yq+H`5)d-+f#gOC zs|(*z;jv?3dIjDl4@0P|Y+)_74qufYoMr&viN`mVz*nXq+KeK`=QmO3@EhCGIYhtB zAcY^OsI}*In@(m-07h~_5*Pqxi!-YjIR6;WhlcR9_ZeP~jIdyr*M(pp0F8Z+?3z?5 zlTnc-)M>a2yBvqVHG3FVTLs9XFm_ zh5MLe8vr$z%Y^_*MlBo)F#x)m*veW?p2m2j1zp#!Lz1K&>u$FTp|&>gyip|zL{Sn5 z1_Rq1C`J%k1!O_wdZ)s1)B%5EBa3Mcp322XA`xTvBq7h!ku!EroNnk~J_W@Vvu&U) zu;Re)*4o;d#{q#F&0yK*=pAL_&HX`5XPPm)rB=i;+ke?~&uf;}f; zeSIA|&vjbH7b0Oe94dGYluSY^D@4MQE3liBa5p486Am9>J+K!iVaWjg_9T>jGA>=b zP&$BraS|SUP5A50=;#=tU!#ouZX!;+UN0slCJ^6T!P@3BrkAI%mD<3<+85ZQ3N%zV zAr-UXh8=S1l&6{T53 zl{F5Myo{;cTG`E1v6U%G9OdN4$XQi}WHL>XbFflw)yFFes$y1w!@p*S0QMWePXPu1 XMD=b^@6P1_00000NkvXXu0mjf(Ib;M diff --git a/koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/vokal/BOOK.png b/koha-tmpl/intranet-tmpl/prog/img/itemtypeimg/vokal/BOOK.png deleted file mode 100644 index b6fe7ac72ed46f0125e4c6551c4e4569a4d26d2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3825 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 diff --git a/koha-tmpl/opac-tmpl/prog/itemtypeimg/vokal/BOOK-32px.png b/koha-tmpl/opac-tmpl/prog/itemtypeimg/vokal/BOOK-32px.png deleted file mode 100644 index c0aaad545f8be43e5010a2137f8cb92c51ce34b9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 897 zcmV-{1AhF8P);S_31ODM1a z+cA<9k~Ri(MMCS+1sfI;7rqwg%9R2e!H}pcNi;FWg;D;3KR^@YQDdSD0=h7QU;`A8 z;*^JN+L`g*JJVui+F&(645vN0GxwhMeD|DhZohK6u46xq$3EL30P*2?uTR(1E2^eK z%VeObDpbuJbJxT*dasdDWAkhzuCZ&~bg)q+uB(7b_@$}Fnoic(yq+H`5)d-+f#gOC zs|(*z;jv?3dIjDl4@0P|Y+)_74qufYoMr&viN`mVz*nXq+KeK`=QmO3@EhCGIYhtB zAcY^OsI}*In@(m-07h~_5*Pqxi!-YjIR6;WhlcR9_ZeP~jIdyr*M(pp0F8Z+?3z?5 zlTnc-)M>a2yBvqVHG3FVTLs9XFm_ zh5MLe8vr$z%Y^_*MlBo)F#x)m*veW?p2m2j1zp#!Lz1K&>u$FTp|&>gyip|zL{Sn5 z1_Rq1C`J%k1!O_wdZ)s1)B%5EBa3Mcp322XA`xTvBq7h!ku!EroNnk~J_W@Vvu&U) zu;Re)*4o;d#{q#F&0yK*=pAL_&HX`5XPPm)rB=i;+ke?~&uf;}f; zeSIA|&vjbH7b0Oe94dGYluSY^D@4MQE3liBa5p486Am9>J+K!iVaWjg_9T>jGA>=b zP&$BraS|SUP5A50=;#=tU!#ouZX!;+UN0slCJ^6T!P@3BrkAI%mD<3<+85ZQ3N%zV zAr-UXh8=S1l&6{T53 zl{F5Myo{;cTG`E1v6U%G9OdN4$XQi}WHL>XbFflw)yFFes$y1w!@p*S0QMWePXPu1 XMD=b^@6P1_00000NkvXXu0mjf(Ib;M diff --git a/koha-tmpl/opac-tmpl/prog/itemtypeimg/vokal/BOOK.png b/koha-tmpl/opac-tmpl/prog/itemtypeimg/vokal/BOOK.png deleted file mode 100644 index b6fe7ac72ed46f0125e4c6551c4e4569a4d26d2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3825 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 -- 2.39.5