Bug 18980: Add remark next to "Anyone seeing this list" permission
This is a follow-up of report 18228 that simplifies the permissions for lists. It reapplies the idea behind bug 10865 by adding a remark next to the Anyone permission if it is not actually effective. A next patch will make it behave dynamically. Note: The Anyone permission is not relevant if it is a private list that has no shares. Note that looking at the prefs OpacAllowPublicListCreation and/or OpacAllowSharingPrivateLists is not decisive. You should look at list permissions and shares in the database; turning off the Sharing pref does not automatically remove all shares in the system. It only blocks creating new shares. We only need changes in opac-shelves.tt and virtualshelves/shelves.tt. Test plan: [1] Verify that you see the remark now in OPAC and staff. Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Nick Clemens <nick@bywatersolutions.com> Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
parent
ffe659e92a
commit
3e5cad0f03
|
|
@ -9,6 +9,26 @@
|
|||
[% INCLUDE 'datatables.inc' %]
|
||||
<script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.dataTables.columnFilter.js"></script>
|
||||
|
||||
[% BLOCK list_permissions %]
|
||||
<li>
|
||||
<label for="allow_changes_from">Allow changes to contents from: </label>
|
||||
<select name="allow_changes_from" id="allow_changes_from">
|
||||
|
||||
[% IF shelf.allow_change_from_owner %]<option value="0">Nobody</option>[% ELSE %]<option value="0" selected="selected">Nobody</option>[% END %]
|
||||
|
||||
[% IF shelf.allow_change_from_owner && (( !shelf.is_public && !shelf.is_shared ) || !shelf.allow_change_from_others ) %]
|
||||
<option value="1" selected="selected">Owner only</option>
|
||||
[% ELSE %]
|
||||
<option value="1">Owner only</option>
|
||||
[% END %]
|
||||
|
||||
[% IF shelf.allow_change_from_others %]<option value="2" selected="selected">Anyone seeing this list</option>[% ELSE %]<option value="2">Anyone seeing this list</option>[% END %]
|
||||
|
||||
</select>
|
||||
  <span id="anyone_remark" style="color:red;">The Anyone permission has no actual effect while this list is strictly private.</span>
|
||||
</li>
|
||||
[% END %]
|
||||
|
||||
[% IF print %]
|
||||
<script type="text/javascript">
|
||||
$( document ).ready(function() {
|
||||
|
|
@ -549,14 +569,7 @@ function placeHold () {
|
|||
[% END %]
|
||||
</select></li>
|
||||
|
||||
<li>
|
||||
<label for="allow_changes_from">Allow changes to contents from: </label>
|
||||
<select name="allow_changes_from" id="allow_changes_from">
|
||||
[% IF !shelf.allow_change_from_owner %]<option value="0">Nobody</option>[% ELSE %]<option value="0" selected="selected">Nobody</option>[% END %]
|
||||
[% IF shelf.allow_change_from_owner && !shelf.allow_change_from_others %]<option value="1" selected="selected">Owner only</option>[% ELSE %]<option value="1">Owner only</option>[% END %]
|
||||
[% IF shelf.allow_change_from_owner && shelf.allow_change_from_others %]<option value="2" selected="selected">Anyone seeing this list</option>[% ELSE %]<option value="2">Anyone seeing this list</option>[% END %]
|
||||
</select>
|
||||
</li>
|
||||
[% INCLUDE list_permissions %]
|
||||
|
||||
</ol>
|
||||
</fieldset>
|
||||
|
|
|
|||
|
|
@ -14,10 +14,19 @@
|
|||
<li>
|
||||
<label for="allow_changes_from">Allow changes to contents from: </label>
|
||||
<select name="allow_changes_from" id="allow_changes_from">
|
||||
[% IF !shelf.allow_change_from_owner %]<option value="0">Nobody</option>[% ELSE %]<option value="0" selected="selected">Nobody</option>[% END %]
|
||||
[% IF shelf.allow_change_from_owner && !shelf.allow_change_from_others %]<option value="1" selected="selected">Owner only</option>[% ELSE %]<option value="1">Owner only</option>[% END %]
|
||||
[% IF shelf.allow_change_from_owner && shelf.allow_change_from_others %]<option value="2" selected="selected">Anyone seeing this list</option>[% ELSE %]<option value="2">Anyone seeing this list</option>[% END %]
|
||||
|
||||
[% IF shelf.allow_change_from_owner %]<option value="0">Nobody</option>[% ELSE %]<option value="0" selected="selected">Nobody</option>[% END %]
|
||||
|
||||
[% IF shelf.allow_change_from_owner && (( !shelf.is_public && !shelf.is_shared ) || !shelf.allow_change_from_others ) %]
|
||||
<option value="1" selected="selected">Owner only</option>
|
||||
[% ELSE %]
|
||||
<option value="1">Owner only</option>
|
||||
[% END %]
|
||||
|
||||
[% IF shelf.allow_change_from_others %]<option value="2" selected="selected">Anyone seeing this list</option>[% ELSE %]<option value="2">Anyone seeing this list</option>[% END %]
|
||||
|
||||
</select>
|
||||
  <span id="anyone_remark" style="color:red;">The Anyone permission has no actual effect while this list is strictly private.</span>
|
||||
</li>
|
||||
[% END %]
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue