Bugzilla – Attachment 26076 Details for
Bug 10865
Don't show list permissions when adding public lists/sharing lists is not allowed
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
bug 10865: (follow-up) allow patrons to make their public lists private when OpacAllowPublicListCreation is off
bug-10865-follow-up-allow-patrons-to-make-their-pu.patch (text/plain), 6.28 KB, created by
Biblibre Sandboxes
on 2014-03-11 11:11:09 UTC
(
hide
)
Description:
bug 10865: (follow-up) allow patrons to make their public lists private when OpacAllowPublicListCreation is off
Filename:
MIME Type:
Creator:
Biblibre Sandboxes
Created:
2014-03-11 11:11:09 UTC
Size:
6.28 KB
patch
obsolete
>From 3ca377bd0fec7d625680846d18d4ca2b39777c72 Mon Sep 17 00:00:00 2001 >From: Galen Charlton <gmc@esilibrary.com> >Date: Fri, 21 Feb 2014 20:44:24 +0000 >Subject: [PATCH] bug 10865: (follow-up) allow patrons to make their public lists private when OpacAllowPublicListCreation is off > >This patch ensures that patrons continue to have the ability to make >their public lists private for any public lists they control that were >created before the library turned the OpacAllowPublicListCreation >system preference off. > >To test: > >[1] Ensure OpacAllowPublicListCreation is on. >[2] As a patron, create a public list in the OPAC. Also, create > a private list. >[3] Turn OpacAllowPublicListCreation off. >[4] Back in the OPAC, verify that the public list can be edited > and that there are drop-downs for category and permissions. > Also verify that there is a warning that the patron cannot > change it back if they convert a public list to private. >[5] Edit the private list created in step 2. Verify that the > category and permissions drop-downs are not displayed. > >Signed-off-by: Galen Charlton <gmc@esilibrary.com> > >Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> > >Signed-off-by: Broust <jean-manuel.broust@univ-lyon2.fr> >--- > .../opac-tmpl/bootstrap/en/modules/opac-shelves.tt | 13 ++++++------- > .../opac-tmpl/prog/en/modules/opac-shelves.tt | 13 ++++++------- > 2 files changed, 12 insertions(+), 14 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >index de5cee5..39159cc 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt >@@ -543,7 +543,7 @@ > [% END %] > </select> > </li> >- [% IF (OpacAllowPublicListCreation) %] >+ [% IF ( OpacAllowPublicListCreation || category2 ) %] > <li> > <label for="category">Category:</label> > <select name="category" id="category"> >@@ -558,16 +558,15 @@ > <option value="2">Public</option> > [% END %] > </select> >+ [% IF ( category2 && !OpacAllowPublicListCreation ) %] >+ The library has disabled the ability for patrons to create new public lists. If you make your list private, you will not be able to make it public again. >+ [% END %] > </li> > [% INCLUDE list_permissions %] > [% END %] > </ol> >- [% UNLESS ( OpacAllowPublicListCreation ) %] >- [% IF ( category2 ) %] >- <input type="hidden" name="category" value="2" /> >- [% ELSE %] >- <input type="hidden" name="category" value="1" /> >- [% END %] >+ [% UNLESS ( OpacAllowPublicListCreation || category2 ) %] >+ <input type="hidden" name="category" value="1" /> > [% END %] > </fieldset> > >diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt >index a961d5d..b157994 100644 >--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt >+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt >@@ -564,23 +564,22 @@ $(document).ready(function() { > [% IF ( sortfield == "itemcallnumber" ) %]<option value="itemcallnumber" selected="selected">Call number</option>[% ELSE %]<option value="itemcallnumber">Call number</option>[% END %] > </select> > </li> >- [% IF (OpacAllowPublicListCreation) %] >+ [% IF ( OpacAllowPublicListCreation || category2 ) %] > <li> > <label for="category">Category:</label> > <select name="category" id="category"> > [% IF ( category1 ) %]<option value="1" selected="selected">Private</option>[% ELSE %]<option value="1">Private</option>[% END %] > [% IF ( category2 ) %]<option value="2" selected="selected">Public</option>[% ELSE %]<option value="2">Public</option>[% END %] > </select> >+ [% IF ( category2 && !OpacAllowPublicListCreation ) %] >+ The library has disabled the ability for patrons to create new public lists. If you make your list private, you will not be able to make it public again. >+ [% END %] > </li> > [% INCLUDE list_permissions %] > [% END %] > </ol> >- [% UNLESS ( OpacAllowPublicListCreation ) %] >- [% IF ( category2 ) %] >- <input type="hidden" name="category" value="2" /> >- [% ELSE %] >- <input type="hidden" name="category" value="1" /> >- [% END %] >+ [% UNLESS ( OpacAllowPublicListCreation || category2 ) %] >+ <input type="hidden" name="category" value="1" /> > [% END %] > </fieldset> > <fieldset class="action"><input type="submit" value="Save" class="submit" /> [% IF ( showprivateshelves ) %]<a class="cancel" href="/cgi-bin/koha/opac-shelves.pl?shelfnumber=[% shelfnumber %]&display=privateshelves">Cancel</a>[% ELSE %]<a class="cancel" href="/cgi-bin/koha/opac-shelves.pl?shelfnumber=[% shelfnumber %]">Cancel</a>[% END %]</fieldset> >-- >1.7.2.5
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 10865
:
20955
|
25056
|
25058
|
25137
|
25168
|
25202
|
25203
|
25552
|
25621
|
25623
|
25655
|
25656
|
26074
|
26075
|
26076
|
26077
|
26923
|
26934
|
26935
|
26936
|
26937