Bug 30418: Template and JavaScript changes
Sponsored-by: Catalyst IT, New Zealand Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Lucas Gass <lucas@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
parent
19854127ee
commit
fe1f6464cc
3 changed files with 34 additions and 1 deletions
|
@ -729,6 +729,11 @@
|
|||
Edit public lists (Name, settings, and permissions, but not explicitly contents)
|
||||
</span>
|
||||
<span class="permissioncode">([% name | html %])</span>
|
||||
[%- CASE 'edit_public_list_contents' -%]
|
||||
<span class="sub_permission edit_public_list_contents_subpermission">
|
||||
Edit public lists contents
|
||||
</span>
|
||||
<span class="permissioncode">([% name | html %])</span>
|
||||
[%- CASE 'upload_general_files' -%]
|
||||
<span class="sub_permission upload_general_files_subpermission">
|
||||
Upload any file
|
||||
|
|
|
@ -47,10 +47,18 @@
|
|||
<option value="3" selected="selected">Staff only</option>
|
||||
[% ELSE %]
|
||||
<option value="3">Staff only</option>
|
||||
[% END %]
|
||||
[% END %]
|
||||
|
||||
[% 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 %]
|
||||
|
||||
</select>
|
||||
  <span id="anyone_remark" style="display:none;color:red;">The Anyone permission has no actual effect while this list is strictly private.</span>
|
||||
  <span id="staff_remark" style="display:none;color:red;">The Staff only permission has no actual effect while this list is strictly private.</span>
|
||||
  <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>
|
||||
</li>
|
||||
[% END %]
|
||||
</head>
|
||||
|
@ -917,6 +925,7 @@
|
|||
if( perms < 2 ) {
|
||||
$("#anyone_remark").hide();
|
||||
$("#staff_remark").hide();
|
||||
$("#permitted_staff_remark").hide();
|
||||
} else if( public==0 ) {
|
||||
// If we move to Private (without shares), show Anyone remark
|
||||
// Note: the number of shares is not tested real-time
|
||||
|
@ -924,17 +933,25 @@
|
|||
if( perms== 2) {
|
||||
$("#anyone_remark").show();
|
||||
$("#staff_remark").hide();
|
||||
$("#permitted_staff_remark").hide();
|
||||
} else if ( perms==3 ) {
|
||||
$("#anyone_remark").hide();
|
||||
$("#staff_remark").show();
|
||||
$("#permitted_staff_remark").hide();
|
||||
} else if ( perms==4 ) {
|
||||
$("#anyone_remark").hide();
|
||||
$("#staff_remark").hide();
|
||||
$("#permitted_staff_remark").show();
|
||||
}
|
||||
[% ELSE %]
|
||||
$("#anyone_remark").hide();
|
||||
$("#staff_remark").hide();
|
||||
$("#permitted_staff_remark").hide();
|
||||
[% END %]
|
||||
} else { // public==1
|
||||
$("#anyone_remark").hide();
|
||||
$("#staff_remark").hide();
|
||||
$("#permitted_staff_remark").hide();
|
||||
}
|
||||
}
|
||||
[% IF op == 'view' %]
|
||||
|
|
|
@ -51,10 +51,12 @@
|
|||
[% 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 %]
|
||||
|
||||
[% 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 %]
|
||||
[% 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 %]
|
||||
|
||||
</select>
|
||||
  <span id="anyone_remark" style="display:none;color:red;">The "Anyone" permission has no actual effect while this list is strictly private.</span>
|
||||
  <span id="staff_remark" style="display:none;color:red;">The "Staff only" permission has no actual effect while this list is strictly private.</span>
|
||||
  <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>
|
||||
</li>
|
||||
[% END %]
|
||||
|
||||
|
@ -1107,6 +1109,7 @@ function AdjustRemark() {
|
|||
if( perms < 2 ) {
|
||||
$("#anyone_remark").hide();
|
||||
$("#staff_remark").hide();
|
||||
$("#permitted_staff_remark").hide();
|
||||
} else if( public==0 ) {
|
||||
// If we move to Private (without shares), show Anyone remark
|
||||
// Note: the number of shares is not tested real-time
|
||||
|
@ -1114,17 +1117,25 @@ function AdjustRemark() {
|
|||
if ( perms==2 ) {
|
||||
$("#anyone_remark").show();
|
||||
$("#staff_remark").hide();
|
||||
$("#permitted_staff_remark").hide();
|
||||
} else if ( perms==3 ) {
|
||||
$("#anyone_remark").hide();
|
||||
$("#staff_remark").show();
|
||||
$("#permitted_staff_remark").hide();
|
||||
} else if ( perms==4 ) {
|
||||
$("#anyone_remark").hide();
|
||||
$("#staff_remark").hide();
|
||||
$("#permitted_staff_remark").show();
|
||||
}
|
||||
[% ELSE %]
|
||||
$("#anyone_remark").hide();
|
||||
$("#staff_remark").hide();
|
||||
$("#permitted_staff_remark").hide();
|
||||
[% END %]
|
||||
} else { // public==1
|
||||
$("#anyone_remark").hide();
|
||||
$("#staff_remark").hide();
|
||||
$("#permitted_staff_remark").hide();
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
Loading…
Reference in a new issue