View | Details | Raw Unified | Return to bug 30418
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc (+5 lines)
Lines 726-731 Link Here
726
            Edit public lists (Name, settings, and permissions, but not explicitly contents)
726
            Edit public lists (Name, settings, and permissions, but not explicitly contents)
727
        </span>
727
        </span>
728
        <span class="permissioncode">([% name | html %])</span>
728
        <span class="permissioncode">([% name | html %])</span>
729
    [%- CASE 'edit_public_list_contents' -%]
730
        <span class="sub_permission edit_public_list_contents_subpermission">
731
            Edit public lists contents
732
        </span>
733
        <span class="permissioncode">([% name | html %])</span>
729
    [%- CASE 'upload_general_files' -%]
734
    [%- CASE 'upload_general_files' -%]
730
        <span class="sub_permission upload_general_files_subpermission">
735
        <span class="sub_permission upload_general_files_subpermission">
731
            Upload any file
736
            Upload any file
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt (-1 / +18 lines)
Lines 47-56 Link Here
47
                <option value="3" selected="selected">Staff only</option>
47
                <option value="3" selected="selected">Staff only</option>
48
            [% ELSE %]
48
            [% ELSE %]
49
                <option value="3">Staff only</option>
49
                <option value="3">Staff only</option>
50
                [% END %]
50
            [% END %]
51
52
            [% IF shelf.allow_change_from_permitted_staff %]
53
                <option value="4" selected="selected">Permitted staff only</option>
54
            [% ELSE %]
55
                <option value="4">Permitted staff only</option>
56
            [% END %]
57
51
        </select>
58
        </select>
52
        &emsp; <span id="anyone_remark" style="display:none;color:red;">The Anyone permission has no actual effect while this list is strictly private.</span>
59
        &emsp; <span id="anyone_remark" style="display:none;color:red;">The Anyone permission has no actual effect while this list is strictly private.</span>
53
        &emsp; <span id="staff_remark" style="display:none;color:red;">The Staff only permission has no actual effect while this list is strictly private.</span>
60
        &emsp; <span id="staff_remark" style="display:none;color:red;">The Staff only permission has no actual effect while this list is strictly private.</span>
61
        &emsp; <span id="permitted_staff_remark" style="display:none;color:red;">The Permitted staff only permission has no actual effect while this list is strictly private.</span>
54
    </li>
62
    </li>
55
[% END %]
63
[% END %]
56
</head>
64
</head>
Lines 912-917 Link Here
912
            if( perms < 2 ) {
920
            if( perms < 2 ) {
913
                $("#anyone_remark").hide();
921
                $("#anyone_remark").hide();
914
                $("#staff_remark").hide();
922
                $("#staff_remark").hide();
923
                $("#permitted_staff_remark").hide();
915
            } else if( public==0 ) {
924
            } else if( public==0 ) {
916
                // If we move to Private (without shares), show Anyone remark
925
                // If we move to Private (without shares), show Anyone remark
917
                // Note: the number of shares is not tested real-time
926
                // Note: the number of shares is not tested real-time
Lines 919-935 Link Here
919
                    if( perms== 2) {
928
                    if( perms== 2) {
920
                        $("#anyone_remark").show();
929
                        $("#anyone_remark").show();
921
                        $("#staff_remark").hide();
930
                        $("#staff_remark").hide();
931
                        $("#permitted_staff_remark").hide();
922
                    } else if ( perms==3 ) {
932
                    } else if ( perms==3 ) {
923
                        $("#anyone_remark").hide();
933
                        $("#anyone_remark").hide();
924
                        $("#staff_remark").show();
934
                        $("#staff_remark").show();
935
                        $("#permitted_staff_remark").hide();
936
                    } else if ( perms==4 ) {
937
                        $("#anyone_remark").hide();
938
                        $("#staff_remark").hide();
939
                        $("#permitted_staff_remark").show();
925
                    }
940
                    }
926
                [% ELSE %]
941
                [% ELSE %]
927
                    $("#anyone_remark").hide();
942
                    $("#anyone_remark").hide();
928
                    $("#staff_remark").hide();
943
                    $("#staff_remark").hide();
944
                    $("#permitted_staff_remark").hide();
929
                [% END %]
945
                [% END %]
930
            } else { // public==1
946
            } else { // public==1
931
                $("#anyone_remark").hide();
947
                $("#anyone_remark").hide();
932
                $("#staff_remark").hide();
948
                $("#staff_remark").hide();
949
                $("#permitted_staff_remark").hide();
933
            }
950
            }
934
        }
951
        }
935
        [% IF op == 'view' %]
952
        [% IF op == 'view' %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt (-1 / +11 lines)
Lines 51-60 Link Here
51
            [% 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 %]
51
            [% 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 %]
52
52
53
            [% IF staffuser == 1 %][% IF shelf.allow_change_from_staff %]<option value="3" selected="selected">Staff only</option>[% ELSE %]<option value="3">Staff only</option>[% END %][% END %]
53
            [% IF staffuser == 1 %][% IF shelf.allow_change_from_staff %]<option value="3" selected="selected">Staff only</option>[% ELSE %]<option value="3">Staff only</option>[% END %][% END %]
54
            [% IF permitteduser == 1 %][% shelf.allow_change_from_permitted_staff %]<option value="4" selected="selected">Permitted staff only</option>[% ELSE %]<option value="4">Permitted staff only</option>[% END %'[% END %]
54
55
55
        </select>
56
        </select>
56
        &emsp; <span id="anyone_remark" style="display:none;color:red;">The "Anyone" permission has no actual effect while this list is strictly private.</span>
57
        &emsp; <span id="anyone_remark" style="display:none;color:red;">The "Anyone" permission has no actual effect while this list is strictly private.</span>
57
        &emsp; <span id="staff_remark" style="display:none;color:red;">The "Staff only" permission has no actual effect while this list is strictly private.</span>
58
        &emsp; <span id="staff_remark" style="display:none;color:red;">The "Staff only" permission has no actual effect while this list is strictly private.</span>
59
         &emsp; <span id="permitted_staff_remark" style="display:none;color:red;">The "Permitted staff only" permission has no actual effect while this list is strictly private.</span>
58
    </li>
60
    </li>
59
[% END %]
61
[% END %]
60
62
Lines 1097-1102 function AdjustRemark() { Link Here
1097
    if( perms < 2 ) {
1099
    if( perms < 2 ) {
1098
        $("#anyone_remark").hide();
1100
        $("#anyone_remark").hide();
1099
        $("#staff_remark").hide();
1101
        $("#staff_remark").hide();
1102
        $("#permitted_staff_remark").hide();
1100
    } else if( public==0 ) {
1103
    } else if( public==0 ) {
1101
        // If we move to Private (without shares), show Anyone remark
1104
        // If we move to Private (without shares), show Anyone remark
1102
        // Note: the number of shares is not tested real-time
1105
        // Note: the number of shares is not tested real-time
Lines 1104-1120 function AdjustRemark() { Link Here
1104
            if ( perms==2 ) {
1107
            if ( perms==2 ) {
1105
                $("#anyone_remark").show();
1108
                $("#anyone_remark").show();
1106
                $("#staff_remark").hide();
1109
                $("#staff_remark").hide();
1110
                $("#permitted_staff_remark").hide();
1107
            } else if ( perms==3 ) {
1111
            } else if ( perms==3 ) {
1108
                $("#anyone_remark").hide();
1112
                $("#anyone_remark").hide();
1109
                $("#staff_remark").show();
1113
                $("#staff_remark").show();
1114
                $("#permitted_staff_remark").hide();
1115
            } else if ( perms==4 ) {
1116
                $("#anyone_remark").hide();
1117
                $("#staff_remark").hide();
1118
                $("#permitted_staff_remark").show();
1110
            }
1119
            }
1111
        [% ELSE %]
1120
        [% ELSE %]
1112
            $("#anyone_remark").hide();
1121
            $("#anyone_remark").hide();
1113
            $("#staff_remark").hide();
1122
            $("#staff_remark").hide();
1123
            $("#permitted_staff_remark").hide();
1114
        [% END %]
1124
        [% END %]
1115
    } else { // public==1
1125
    } else { // public==1
1116
        $("#anyone_remark").hide();
1126
        $("#anyone_remark").hide();
1117
        $("#staff_remark").hide();
1127
        $("#staff_remark").hide();
1128
        $("#permitted_staff_remark").hide();
1118
    }
1129
    }
1119
}
1130
}
1120
</script>
1131
</script>
1121
- 

Return to bug 30418