Attachment 38774 Details for Bug 12160 – [PASSED QA] Bug 12160: Rename intranetuserjs with IntranetUserJS

[patch] [PASSED QA] Bug 12160: Rename intranetuserjs with IntranetUserJS

PASSED-QA-Bug-12160-Rename-intranetuserjs-with-Int.patch (text/plain), 14.57 KB, created by Katrin Fischer on 2015-05-03 15:45:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2015-05-03 15:45:02 UTC

Size: 14.57 KB

patch

obsolete

>From 7b5c49730a15a50d7c181e53640cc0a83c913a07 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@biblibre.com>
>Date: Mon, 27 Apr 2015 15:55:31 +0200
>Subject: [PATCH] [PASSED QA] Bug 12160: Rename intranetuserjs with
> IntranetUserJS
>
>To match IntranetUserCSS, intranetuserjs should be renamed
>IntranetUserJS.
>
>Test plan:
>1/ Be sure there is no occurrence of intranetuserjs
>2/ Confirm the pref still works as before
>
>Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
>
>NOTE: Worked before and after updatedatabase.pl, though after
> is less confusing to the person unaware of case insensitivity.
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> C4/Auth.pm | 4 ++--
> .../Bug_12160-Rename_pref_intranetuserjs_to_IntranetUserJS.sql | 1 +
> installer/data/mysql/sysprefs.sql | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc | 4 ++--
> .../intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt | 4 ++--
> 6 files changed, 9 insertions(+), 8 deletions(-)
> create mode 100644 installer/data/mysql/atomicupdate/Bug_12160-Rename_pref_intranetuserjs_to_IntranetUserJS.sql
>
>diff --git a/C4/Auth.pm b/C4/Auth.pm
>index 4b02701..08a4560 100644
>--- a/C4/Auth.pm
>+++ b/C4/Auth.pm
>@@ -409,7 +409,7 @@ sub get_template_and_user {
> intranetreadinghistory => C4::Context->preference("intranetreadinghistory"),
> intranetstylesheet => C4::Context->preference("intranetstylesheet"),
> IntranetUserCSS => C4::Context->preference("IntranetUserCSS"),
>- intranetuserjs => C4::Context->preference("intranetuserjs"),
>+ IntranetUserJS => C4::Context->preference("IntranetUserJS"),
> intranetbookbag => C4::Context->preference("intranetbookbag"),
> suggestion => C4::Context->preference("suggestion"),
> virtualshelves => C4::Context->preference("virtualshelves"),
>@@ -1195,7 +1195,7 @@ sub checkauth {
> intranetbookbag => C4::Context->preference("intranetbookbag"),
> IntranetNav => C4::Context->preference("IntranetNav"),
> IntranetFavicon => C4::Context->preference("IntranetFavicon"),
>- intranetuserjs => C4::Context->preference("intranetuserjs"),
>+ IntranetUserJS => C4::Context->preference("IntranetUserJS"),
> IndependentBranches => C4::Context->preference("IndependentBranches"),
> AutoLocation => C4::Context->preference("AutoLocation"),
> wrongip => $info{'wrongip'},
>diff --git a/installer/data/mysql/atomicupdate/Bug_12160-Rename_pref_intranetuserjs_to_IntranetUserJS.sql b/installer/data/mysql/atomicupdate/Bug_12160-Rename_pref_intranetuserjs_to_IntranetUserJS.sql
>new file mode 100644
>index 0000000..763cc76
>--- /dev/null
>+++ b/installer/data/mysql/atomicupdate/Bug_12160-Rename_pref_intranetuserjs_to_IntranetUserJS.sql
>@@ -0,0 +1 @@
>+UPDATE systempreferences SET variable="IntranetUserJS" where variable="intranetuserjs"
>diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
>index d4c6409..590c4f4 100644
>--- a/installer/data/mysql/sysprefs.sql
>+++ b/installer/data/mysql/sysprefs.sql
>@@ -171,7 +171,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('IntranetSlipPrinterJS','','','Use this JavaScript for printing slips. Define at least function printThenClose(). For use e.g. with Firefox PlugIn jsPrintSetup, see http://jsprintsetup.mozdev.org/','Free'),
> ('intranetstylesheet','','50','Enter a complete URL to use an alternate layout stylesheet in Intranet','free'),
> ('IntranetUserCSS','',NULL,'Add CSS to be included in the intranet in an embedded <style> tag.','free'),
>-('intranetuserjs','','70|10','Custom javascript for inclusion in Intranet','Textarea'),
>+('IntranetUserJS','','70|10','Custom javascript for inclusion in Intranet','Textarea'),
> ('intranet_includes','includes',NULL,'The includes directory you want for specific look of Koha (includes or includes_npl for example)','Free'),
> ('ISBD','#100||{ 100a }{ 100b }{ 100c }{ 100d }{ 110a }{ 110b }{ 110c }{ 110d }{ 110e }{ 110f }{ 110g }{ 130a }{ 130d }{ 130f }{ 130g }{ 130h }{ 130k }{ 130l }{ 130m }{ 130n }{ 130o }{ 130p }{ 130r }{ 130s }{ 130t }| \r\n#245||{ 245a }{ 245b }{245f }{ 245g }{ 245k }{ 245n }{ 245p }{ 245s }{ 245h }|\r\n#246||{ : 246i }{ 246a }{ 246b }{ 246f }{ 246g }{ 246n }{ 246p }{ 246h }|\r\n#242||{ = 242a }{ 242b }{ 242n }{ 242p }{ 242h }|\r\n#245||{ 245c }|\r\n#242||{ = 242c }|\r\n#250| - |{ 250a }{ 250b }|\r\n#254|, |{ 254a }|\r\n#255|, |{ 255a }{ 255b }{ 255c }{ 255d }{ 255e }{ 255f }{ 255g }|\r\n#256|, |{ 256a }|\r\n#257|, |{ 257a }|\r\n#258|, |{ 258a }{ 258b }|\r\n#260| - |{ 260a }{ 260b }{ 260c }|\r\n#300| - |{ 300a }{ 300b }{ 300c }{ 300d }{ 300e }{ 300f }{ 300g }|\r\n#306| - |{ 306a }|\r\n#307| - |{ 307a }{ 307b }|\r\n#310| - |{ 310a }{ 310b }|\r\n#321| - |{ 321a }{ 321b }|\r\n#340| - |{ 3403 }{ 340a }{ 340b }{ 340c }{ 340d }{ 340e }{ 340f }{ 340h }{ 340i }|\r\n#342| - |{ 342a }{ 342b }{ 342c }{ 342d }{ 342e }{ 342f }{ 342g }{ 342h }{ 342i }{ 342j }{ 342k }{ 342l }{ 342m }{ 342n }{ 342o }{ 342p }{ 342q }{ 342r }{ 342s }{ 342t }{ 342u }{ 342v }{ 342w }|\r\n#343| - |{ 343a }{ 343b }{ 343c }{ 343d }{ 343e }{ 343f }{ 343g }{ 343h }{ 343i }|\r\n#351| - |{ 3513 }{ 351a }{ 351b }{ 351c }|\r\n#352| - |{ 352a }{ 352b }{ 352c }{ 352d }{ 352e }{ 352f }{ 352g }{ 352i }{ 352q }|\r\n#362| - |{ 362a }{ 351z }|\r\n#440| - |{ 440a }{ 440n }{ 440p }{ 440v }{ 440x }|.\r\n#490| - |{ 490a }{ 490v }{ 490x }|.\r\n#800| - |{ 800a }{ 800b }{ 800c }{ 800d }{ 800e }{ 800f }{ 800g }{ 800h }{ 800j }{ 800k }{ 800l }{ 800m }{ 800n }{ 800o }{ 800p }{ 800q }{ 800r }{ 800s }{ 800t }{ 800u }{ 800v }|.\r\n#810| - |{ 810a }{ 810b }{ 810c }{ 810d }{ 810e }{ 810f }{ 810g }{ 810h }{ 810k }{ 810l }{ 810m }{ 810n }{ 810o }{ 810p }{ 810r }{ 810s }{ 810t }{ 810u }{ 810v }|.\r\n#811| - |{ 811a }{ 811c }{ 811d }{ 811e }{ 811f }{ 811g }{ 811h }{ 811k }{ 811l }{ 811n }{ 811p }{ 811q }{ 811s }{ 811t }{ 811u }{ 811v }|.\r\n#830| - |{ 830a }{ 830d }{ 830f }{ 830g }{ 830h }{ 830k }{ 830l }{ 830m }{ 830n }{ 830o }{ 830p }{ 830r }{ 830s }{ 830t }{ 830v }|.\r\n#500| |{ 5003 }{ 500a }|\r\n#501| |{ 501a }|\r\n#502| |{ 502a }|\r\n#504| |{ 504a }|\r\n#505| |{ 505a }{ 505t }{ 505r }{ 505g }{ 505u }|\r\n#506| |{ 5063 }{ 506a }{ 506b }{ 506c }{ 506d }{ 506u }|\r\n#507| |{ 507a }{ 507b }|\r\n#508| |{ 508a }{ 508a }|\r\n#510| |{ 5103 }{ 510a }{ 510x }{ 510c }{ 510b }|\r\n#511| |{ 511a }|\r\n#513| |{ 513a }{513b }|\r\n#514| |{ 514z }{ 514a }{ 514b }{ 514c }{ 514d }{ 514e }{ 514f }{ 514g }{ 514h }{ 514i }{ 514j }{ 514k }{ 514m }{ 514u }|\r\n#515| |{ 515a }|\r\n#516| |{ 516a }|\r\n#518| |{ 5183 }{ 518a }|\r\n#520| |{ 5203 }{ 520a }{ 520b }{ 520u }|\r\n#521| |{ 5213 }{ 521a }{ 521b }|\r\n#522| |{ 522a }|\r\n#524| |{ 524a }|\r\n#525| |{ 525a }|\r\n#526| |{\\n510i }{\\n510a }{ 510b }{ 510c }{ 510d }{\\n510x }|\r\n#530| |{\\n5063 }{\\n506a }{ 506b }{ 506c }{ 506d }{\\n506u }|\r\n#533| |{\\n5333 }{\\n533a }{\\n533b }{\\n533c }{\\n533d }{\\n533e }{\\n533f }{\\n533m }{\\n533n }|\r\n#534| |{\\n533p }{\\n533a }{\\n533b }{\\n533c }{\\n533d }{\\n533e }{\\n533f }{\\n533m }{\\n533n }{\\n533t }{\\n533x }{\\n533z }|\r\n#535| |{\\n5353 }{\\n535a }{\\n535b }{\\n535c }{\\n535d }|\r\n#538| |{\\n5383 }{\\n538a }{\\n538i }{\\n538u }|\r\n#540| |{\\n5403 }{\\n540a }{ 540b }{ 540c }{ 540d }{\\n520u }|\r\n#544| |{\\n5443 }{\\n544a }{\\n544b }{\\n544c }{\\n544d }{\\n544e }{\\n544n }|\r\n#545| |{\\n545a }{ 545b }{\\n545u }|\r\n#546| |{\\n5463 }{\\n546a }{ 546b }|\r\n#547| |{\\n547a }|\r\n#550| |{ 550a }|\r\n#552| |{ 552z }{ 552a }{ 552b }{ 552c }{ 552d }{ 552e }{ 552f }{ 552g }{ 552h }{ 552i }{ 552j }{ 552k }{ 552l }{ 552m }{ 552n }{ 562o }{ 552p }{ 552u }|\r\n#555| |{ 5553 }{ 555a }{ 555b }{ 555c }{ 555d }{ 555u }|\r\n#556| |{ 556a }{ 506z }|\r\n#563| |{ 5633 }{ 563a }{ 563u }|\r\n#565| |{ 5653 }{ 565a }{ 565b }{ 565c }{ 565d }{ 565e }|\r\n#567| |{ 567a }|\r\n#580| |{ 580a }|\r\n#581| |{ 5633 }{ 581a }{ 581z }|\r\n#584| |{ 5843 }{ 584a }{ 584b }|\r\n#585| |{ 5853 }{ 585a }|\r\n#586| |{ 5863 }{ 586a }|\r\n#020| <label>ISBN: </label>|{ 020a }{ 020c }|\r\n#022| <label>ISSN: </label>|{ 022a }|\r\n#222| = |{ 222a }{ 222b }|\r\n#210| = |{ 210a }{ 210b }|\r\n#024| <label>Standard No.: </label>|{ 024a }{ 024c }{ 024d }{ 0242 }|\r\n#027| <label>Standard Tech. Report. No.: </label>|{ 027a }|\r\n#028| <label>Publisher. No.: </label>|{ 028a }{ 028b }|\r\n#013| <label>Patent No.: </label>|{ 013a }{ 013b }{ 013c }{ 013d }{ 013e }{ 013f }|\r\n#030| <label>CODEN: </label>|{ 030a }|\r\n#037| <label>Source: </label>|{ 037a }{ 037b }{ 037c }{ 037f }{ 037g }{ 037n }|\r\n#010| <label>LCCN: </label>|{ 010a }|\r\n#015| <label>Nat. Bib. No.: </label>|{ 015a }{ 0152 }|\r\n#016| <label>Nat. Bib. Agency Control No.: </label>|{ 016a }{ 0162 }|\r\n#600| <label>Subjects--Personal Names: </label>|{\\n6003 }{\\n600a}{ 600b }{ 600c }{ 600d }{ 600e }{ 600f }{ 600g }{ 600h }{--600k}{ 600l }{ 600m }{ 600n }{ 600o }{--600p}{ 600r }{ 600s }{ 600t }{ 600u }{--600x}{--600z}{--600y}{--600v}|\r\n#610| <label>Subjects--Corporate Names: </label>|{\\n6103 }{\\n610a}{ 610b }{ 610c }{ 610d }{ 610e }{ 610f }{ 610g }{ 610h }{--610k}{ 610l }{ 610m }{ 610n }{ 610o }{--610p}{ 610r }{ 610s }{ 610t }{ 610u }{--610x}{--610z}{--610y}{--610v}|\r\n#611| <label>Subjects--Meeting Names: </label>|{\\n6113 }{\\n611a}{ 611b }{ 611c }{ 611d }{ 611e }{ 611f }{ 611g }{ 611h }{--611k}{ 611l }{ 611m }{ 611n }{ 611o }{--611p}{ 611r }{ 611s }{ 611t }{ 611u }{--611x}{--611z}{--611y}{--611v}|\r\n#630| <label>Subjects--Uniform Titles: </label>|{\\n630a}{ 630b }{ 630c }{ 630d }{ 630e }{ 630f }{ 630g }{ 630h }{--630k }{ 630l }{ 630m }{ 630n }{ 630o }{--630p}{ 630r }{ 630s }{ 630t }{--630x}{--630z}{--630y}{--630v}|\r\n#648| <label>Subjects--Chronological Terms: </label>|{\\n6483 }{\\n648a }{--648x}{--648z}{--648y}{--648v}|\r\n#650| <label>Subjects--Topical Terms: </label>|{\\n6503 }{\\n650a}{ 650b }{ 650c }{ 650d }{ 650e }{--650x}{--650z}{--650y}{--650v}|\r\n#651| <label>Subjects--Geographic Terms: </label>|{\\n6513 }{\\n651a}{ 651b }{ 651c }{ 651d }{ 651e }{--651x}{--651z}{--651y}{--651v}|\r\n#653| <label>Subjects--Index Terms: </label>|{ 653a }|\r\n#654| <label>Subjects--Facted Index Terms: </label>|{\\n6543 }{\\n654a}{--654b}{--654x}{--654z}{--654y}{--654v}|\r\n#655| <label>Index Terms--Genre/Form: </label>|{\\n6553 }{\\n655a}{--655b}{--655x }{--655z}{--655y}{--655v}|\r\n#656| <label>Index Terms--Occupation: </label>|{\\n6563 }{\\n656a}{--656k}{--656x}{--656z}{--656y}{--656v}|\r\n#657| <label>Index Terms--Function: </label>|{\\n6573 }{\\n657a}{--657x}{--657z}{--657y}{--657v}|\r\n#658| <label>Index Terms--Curriculum Objective: </label>|{\\n658a}{--658b}{--658c}{--658d}{--658v}|\r\n#050| <label>LC Class. No.: </label>|{ 050a }{ / 050b }|\r\n#082| <label>Dewey Class. No.: </label>|{ 082a }{ / 082b }|\r\n#080| <label>Universal Decimal Class. No.: </label>|{ 080a }{ 080x }{ / 080b }|\r\n#070| <label>National Agricultural Library Call No.: </label>|{ 070a }{ / 070b }|\r\n#060| <label>National Library of Medicine Call No.: </label>|{ 060a }{ / 060b }|\r\n#074| <label>GPO Item No.: </label>|{ 074a }|\r\n#086| <label>Gov. Doc. Class. No.: </label>|{ 086a }|\r\n#088| <label>Report. No.: </label>|{ 088a }|','70|10','ISBD','Textarea'),
> ('IssueLog','1',NULL,'If ON, log checkout activity','YesNo'),
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
>index f6269de..2f80b78 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
>@@ -23,10 +23,10 @@
> 
> <script type="text/javascript" src="[% themelang %]/js/staff-global.js"></script>
> [% INCLUDE 'validator-strings.inc' %]
>-[% IF ( intranetuserjs ) %]
>+[% IF ( IntranetUserJS ) %]
> <script type="text/javascript">
> //<![CDATA[
>- [% intranetuserjs %]
>+ [% IntranetUserJS %]
> //]]>
> </script>
> [% END %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
>index 0cbaee0..17f06c5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
>@@ -47,7 +47,7 @@ Staff Client:
> class: code
> -
> - "Include the following JavaScript on all pages in the staff client:"
>- - pref: intranetuserjs
>+ - pref: IntranetUserJS
> type: textarea
> class: code
> -
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt
>index 72aa9b1..fabc07b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt
>@@ -11,11 +11,11 @@
> 		}
> 	</style>
> [% IF ( IntranetUserCSS ) %]<style type="text/css">[% IntranetUserCSS %]</style>[% END %]
>-[% IF ( intranetuserjs ) %]
>+[% IF ( IntranetUserJS ) %]
> <script type="text/javascript" src="[% interface %]/lib/jquery/jquery.js"></script>
> <script type="text/javascript">
> //<![CDATA[
>- [% intranetuserjs %]
>+ [% IntranetUserJS %]
> //]]>
> </script>
> [% END %]
>-- 
>1.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 12160: 38563 | 38564 | 38565 | 38566 | 38742 | 38743 | 38774 | 38775