Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 12160: Rename intranetuserjs with IntranetUserJS

Browse source 
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>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
This commit is contained in:
Jonathan Druart 2015-04-27 15:55:31 +02:00 committed by Tomas Cohen Arazi
parent 9b1241ecfc
commit 767edc6bb9
6 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
C4/Auth.pm
View file

@ -410,7 +410,7 @@ sub get_template_and_user {
intranetreadinghistory => C4::Context->preference("intranetreadinghistory"), intranetreadinghistory => C4::Context->preference("intranetreadinghistory"),
intranetstylesheet => C4::Context->preference("intranetstylesheet"), intranetstylesheet => C4::Context->preference("intranetstylesheet"),
IntranetUserCSS => C4::Context->preference("IntranetUserCSS"), IntranetUserCSS => C4::Context->preference("IntranetUserCSS"),
intranetuserjs => C4::Context->preference("intranetuserjs"), IntranetUserJS => C4::Context->preference("IntranetUserJS"),
intranetbookbag => C4::Context->preference("intranetbookbag"), intranetbookbag => C4::Context->preference("intranetbookbag"),
suggestion => C4::Context->preference("suggestion"), suggestion => C4::Context->preference("suggestion"),
virtualshelves => C4::Context->preference("virtualshelves"), virtualshelves => C4::Context->preference("virtualshelves"),
@ -1196,7 +1196,7 @@ sub checkauth {
intranetbookbag => C4::Context->preference("intranetbookbag"), intranetbookbag => C4::Context->preference("intranetbookbag"),
IntranetNav => C4::Context->preference("IntranetNav"), IntranetNav => C4::Context->preference("IntranetNav"),
IntranetFavicon => C4::Context->preference("IntranetFavicon"), IntranetFavicon => C4::Context->preference("IntranetFavicon"),
intranetuserjs => C4::Context->preference("intranetuserjs"), IntranetUserJS => C4::Context->preference("IntranetUserJS"),
IndependentBranches => C4::Context->preference("IndependentBranches"), IndependentBranches => C4::Context->preference("IndependentBranches"),
AutoLocation => C4::Context->preference("AutoLocation"), AutoLocation => C4::Context->preference("AutoLocation"),
wrongip => $info{'wrongip'}, wrongip => $info{'wrongip'},

1
installer/data/mysql/atomicupdate/Bug_12160-Rename_pref_intranetuserjs_to_IntranetUserJS.sql Normal file
View file

@ -0,0 +1 @@
UPDATE systempreferences SET variable="IntranetUserJS" where variable="intranetuserjs"

2
installer/data/mysql/sysprefs.sql
View file

File diff suppressed because one or more lines are too long

4
koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-close.inc
View file

@ -23,10 +23,10 @@
<!-- koha core js --> <!-- koha core js -->
<script type="text/javascript" src="[% themelang %]/js/staff-global.js"></script> <script type="text/javascript" src="[% themelang %]/js/staff-global.js"></script>
[% INCLUDE 'validator-strings.inc' %] [% INCLUDE 'validator-strings.inc' %]
[% IF ( intranetuserjs ) %] [% IF ( IntranetUserJS ) %]
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
[% intranetuserjs %] [% IntranetUserJS %]
//]]> //]]>
</script> </script>
[% END %] [% END %]

2
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
View file

@ -47,7 +47,7 @@ Staff Client:
class: code class: code
- -
- "Include the following JavaScript on all pages in the staff client:" - "Include the following JavaScript on all pages in the staff client:"
- pref: intranetuserjs - pref: IntranetUserJS
type: textarea type: textarea
class: code class: code
- -

4
koha-tmpl/intranet-tmpl/prog/en/modules/labels/spinelabel-print.tt
View file

@ -11,11 +11,11 @@
} }
</style> </style>
[% IF ( IntranetUserCSS ) %]<style type="text/css">[% IntranetUserCSS %]</style>[% END %] [% 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" src="[% interface %]/lib/jquery/jquery.js"></script>
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
[% intranetuserjs %] [% IntranetUserJS %]
//]]> //]]>
</script> </script>
[% END %] [% END %]