Bugzilla – Attachment 99452 Details for
Bug 24682
Clarify UsageStatsGeolocation syspref description and behaviour
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 24682: Make UsageStatsGeolocation readonly (and redirect to the config page)
Bug-24682-Make-UsageStatsGeolocation-readonly-and-.patch (text/plain), 4.72 KB, created by
Maryse Simard
on 2020-02-21 21:13:36 UTC
(
hide
)
Description:
Bug 24682: Make UsageStatsGeolocation readonly (and redirect to the config page)
Filename:
MIME Type:
Creator:
Maryse Simard
Created:
2020-02-21 21:13:36 UTC
Size:
4.72 KB
patch
obsolete
>From 82c7e9626339a86d217861c44168e0f7b74597fd Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Fri, 21 Feb 2020 10:31:54 +0100 >Subject: [PATCH] Bug 24682: Make UsageStatsGeolocation readonly (and redirect > to the config page) > >To prevent invalid values in this pref (and so on the server), we should >make this input readonly on the syspref page. >The sysprefs related to Hea should be edited from the dedicated page, so >also adding a note about that. > >Test plan: >Search syspref with "UsageStats" >Notice the note about the admin page >Notice the UsageStatsGeolocation input is now readonly (and resized, to >display the whole value when filled) > >Signed-off-by: Maryse Simard <maryse.simard@inlibro.com> >--- > .../intranet-tmpl/prog/en/modules/admin/preferences.tt | 6 +++++- > .../prog/en/modules/admin/preferences/admin.pref | 2 ++ > 2 files changed, 7 insertions(+), 1 deletion(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >index ae22e006ce..4c3f867578 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >@@ -80,7 +80,11 @@ > [% IF ( CHUNK.type_text ) %] > [% CHUNK.contents | $raw %] > [% ELSIF ( CHUNK.type_input ) %] >- <input type="[%IF CHUNK.input_type %][% CHUNK.input_type | html %][% ELSE %]text[% END %]" name="pref_[% CHUNK.name | html %]" id="pref_[% CHUNK.name | html %]" class="preference preference-[% CHUNK.class or "short" | html %]" value="[% CHUNK.value | html %]" autocomplete="off" /> [% IF ( CHUNK.dateinput ) %]<span class="hint">[% INCLUDE 'date-format.inc' %]</span>[% END %] >+ [% IF CHUNK.name == 'UsageStatsGeolocation' %] >+ <input type="[%IF CHUNK.input_type %][% CHUNK.input_type | html %][% ELSE %]text[% END %]" name="pref_[% CHUNK.name | html %]" id="pref_[% CHUNK.name | html %]" class="preference preference-[% CHUNK.class or "short" | html %]" value="[% CHUNK.value | html %]" autocomplete="off" readonly="readonly" size="40" style="width: auto;"/> [% IF ( CHUNK.dateinput ) %]<span class="hint">[% INCLUDE 'date-format.inc' %]</span>[% END %] >+ [% ELSE %] >+ <input type="[%IF CHUNK.input_type %][% CHUNK.input_type | html %][% ELSE %]text[% END %]" name="pref_[% CHUNK.name | html %]" id="pref_[% CHUNK.name | html %]" class="preference preference-[% CHUNK.class or "short" | html %]" value="[% CHUNK.value | html %]" autocomplete="off" /> [% IF ( CHUNK.dateinput ) %]<span class="hint">[% INCLUDE 'date-format.inc' %]</span>[% END %] >+ [% END %] > [% ELSIF ( CHUNK.type_select ) %] > <select name="pref_[% CHUNK.name | html %]" id="pref_[% CHUNK.name | html %]" class="preference preference-[% CHUNK.class or "choice" | html %]"> > [% FOREACH CHOICE IN CHUNK.CHOICES.sort('value') %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref >index 00fba12baf..3764386332 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref >@@ -192,6 +192,7 @@ Administration: > - ". Website where usage statistics are published: <a href=\"http://hea.koha-community.org\">Hea Koha community website</a>." > - "<br><strong>NOTE:</strong> The other \"UsageStats\" preferences have no effect if this preference is set to \"No\"." > - "<br><strong>NOTE:</strong> This system preference requires the <code>misc/cronjobs/share_usage_with_koha_community.pl</code> cronjob. Ask your system administrator to schedule it." >+ - "<br><strong>NOTE:</strong> You should use the <a href=\"/cgi-bin/koha/admin/usage_statistics.pl\">dedicated admin configuration page</a> to edit the preference related to Hea." > - > - "Use the following library name to be shown on the Hea Community website: " > - pref: UsageStatsLibraryName >@@ -432,6 +433,7 @@ Administration: > - "Geolocation of the main library: " > - pref: UsageStatsGeolocation > - "<br><strong>NOTE:</strong> This value has no effect if the UsageStats system preference is set to \"Don't share\"." >+ - "<br><strong>NOTE:</strong> You must use the <a href=\"/cgi-bin/koha/admin/usage_statistics.pl\">dedicated admin configuration page</a> to edit this preference." > Search Engine: > - > - "Use following search engine: " >-- >2.17.1
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 24682
:
99361
|
99452
|
99489