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 693-698 Link Here
693
            Edit public lists (Name, settings, and permissions, but not explicitly contents)
693
            Edit public lists (Name, settings, and permissions, but not explicitly contents)
694
        </span>
694
        </span>
695
        <span class="permissioncode">([% name | html %])</span>
695
        <span class="permissioncode">([% name | html %])</span>
696
    [%- CASE 'edit_public_list_contents' -%]
697
        <span class="sub_permission edit_public_list_contents_subpermission">
698
            Edit public lists contents
699
        </span>
700
        <span class="permissioncode">([% name | html %])</span>
696
    [%- CASE 'upload_general_files' -%]
701
    [%- CASE 'upload_general_files' -%]
697
        <span class="sub_permission upload_general_files_subpermission">
702
        <span class="sub_permission upload_general_files_subpermission">
698
            Upload any file
703
            Upload any file
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt (+12 lines)
Lines 37-45 Link Here
37
37
38
            [% IF shelf.allow_change_from_staff %]<option value="3" selected="selected">Staff only</option>[% ELSE %]<option value="3">Staff only</option>[% END %]
38
            [% IF shelf.allow_change_from_staff %]<option value="3" selected="selected">Staff only</option>[% ELSE %]<option value="3">Staff only</option>[% END %]
39
39
40
            [% IF shelf.allow_change_from_permitted_staff %]<option value="4" selected="selected">Permitted staff only</option>[% ELSE %]<option value="4">Permitted staff only</option>[% END %]
41
40
        </select>
42
        </select>
41
        &emsp; <span id="anyone_remark" style="display:none;color:red;">The Anyone permission has no actual effect while this list is strictly private.</span>
43
        &emsp; <span id="anyone_remark" style="display:none;color:red;">The Anyone permission has no actual effect while this list is strictly private.</span>
42
        &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>
44
        &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>
45
        &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>
43
    </li>
46
    </li>
44
[% END %]
47
[% END %]
45
</head>
48
</head>
Lines 854-859 Link Here
854
            if( perms < 2 ) {
857
            if( perms < 2 ) {
855
                $("#anyone_remark").hide();
858
                $("#anyone_remark").hide();
856
                $("#staff_remark").hide();
859
                $("#staff_remark").hide();
860
                $("#permitted_staff_remark").hide();
857
            } else if( public==0 ) {
861
            } else if( public==0 ) {
858
                // If we move to Private (without shares), show Anyone remark
862
                // If we move to Private (without shares), show Anyone remark
859
                // Note: the number of shares is not tested real-time
863
                // Note: the number of shares is not tested real-time
Lines 861-877 Link Here
861
                    if( perms== 2) {
865
                    if( perms== 2) {
862
                        $("#anyone_remark").show();
866
                        $("#anyone_remark").show();
863
                        $("#staff_remark").hide();
867
                        $("#staff_remark").hide();
868
                        $("#permitted_staff_remark").hide();
864
                    } else if ( perms==3 ) {
869
                    } else if ( perms==3 ) {
865
                        $("#anyone_remark").hide();
870
                        $("#anyone_remark").hide();
866
                        $("#staff_remark").show();
871
                        $("#staff_remark").show();
872
                        $("#permitted_staff_remark").hide();
873
                    } else if ( perms==4 ) {
874
                        $("#anyone_remark").hide();
875
                        $("#staff_remark").hide();
876
                        $("#permitted_staff_remark").show();
867
                    }
877
                    }
868
                [% ELSE %]
878
                [% ELSE %]
869
                    $("#anyone_remark").hide();
879
                    $("#anyone_remark").hide();
870
                    $("#staff_remark").hide();
880
                    $("#staff_remark").hide();
881
                    $("#permitted_staff_remark").hide();
871
                [% END %]
882
                [% END %]
872
            } else { // public==1
883
            } else { // public==1
873
                $("#anyone_remark").hide();
884
                $("#anyone_remark").hide();
874
                $("#staff_remark").hide();
885
                $("#staff_remark").hide();
886
                $("#permitted_staff_remark").hide();
875
            }
887
            }
876
        }
888
        }
877
        [% IF op == 'view' %]
889
        [% 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 1082-1087 function AdjustRemark() { Link Here
1082
    if( perms < 2 ) {
1084
    if( perms < 2 ) {
1083
        $("#anyone_remark").hide();
1085
        $("#anyone_remark").hide();
1084
        $("#staff_remark").hide();
1086
        $("#staff_remark").hide();
1087
        $("#permitted_staff_remark").hide();
1085
    } else if( public==0 ) {
1088
    } else if( public==0 ) {
1086
        // If we move to Private (without shares), show Anyone remark
1089
        // If we move to Private (without shares), show Anyone remark
1087
        // Note: the number of shares is not tested real-time
1090
        // Note: the number of shares is not tested real-time
Lines 1089-1105 function AdjustRemark() { Link Here
1089
            if ( perms==2 ) {
1092
            if ( perms==2 ) {
1090
                $("#anyone_remark").show();
1093
                $("#anyone_remark").show();
1091
                $("#staff_remark").hide();
1094
                $("#staff_remark").hide();
1095
                $("#permitted_staff_remark").hide();
1092
            } else if ( perms==3 ) {
1096
            } else if ( perms==3 ) {
1093
                $("#anyone_remark").hide();
1097
                $("#anyone_remark").hide();
1094
                $("#staff_remark").show();
1098
                $("#staff_remark").show();
1099
                $("#permitted_staff_remark").hide();
1100
            } else if ( perms==4 ) {
1101
                $("#anyone_remark").hide();
1102
                $("#staff_remark").hide();
1103
                $("#permitted_staff_remark").show();
1095
            }
1104
            }
1096
        [% ELSE %]
1105
        [% ELSE %]
1097
            $("#anyone_remark").hide();
1106
            $("#anyone_remark").hide();
1098
            $("#staff_remark").hide();
1107
            $("#staff_remark").hide();
1108
            $("#permitted_staff_remark").hide();
1099
        [% END %]
1109
        [% END %]
1100
    } else { // public==1
1110
    } else { // public==1
1101
        $("#anyone_remark").hide();
1111
        $("#anyone_remark").hide();
1102
        $("#staff_remark").hide();
1112
        $("#staff_remark").hide();
1113
        $("#permitted_staff_remark").hide();
1103
    }
1114
    }
1104
}
1115
}
1105
</script>
1116
</script>
1106
- 

Return to bug 30418