diff --git a/admin/tool/policy/classes/output/page_viewalldoc.php b/admin/tool/policy/classes/output/page_viewalldoc.php index f8dacf434d7..5ca5d99bd5e 100644 --- a/admin/tool/policy/classes/output/page_viewalldoc.php +++ b/admin/tool/policy/classes/output/page_viewalldoc.php @@ -63,14 +63,7 @@ class page_viewalldoc implements renderable, templatable { * */ protected function prepare_policies() { - global $USER; - - if (isguestuser() || empty($USER->id)) { - $audience = policy_version::AUDIENCE_GUESTS; - } else { - $audience = policy_version::AUDIENCE_LOGGEDIN; - } - $this->policies = api::list_current_versions($audience); + $this->policies = api::list_current_versions(); } /** diff --git a/admin/tool/policy/lang/en/tool_policy.php b/admin/tool/policy/lang/en/tool_policy.php index c55682587e1..fd291752bc3 100644 --- a/admin/tool/policy/lang/en/tool_policy.php +++ b/admin/tool/policy/lang/en/tool_policy.php @@ -92,6 +92,7 @@ $string['moveup'] = 'Move up'; $string['mustagreetocontinue'] = 'Before continuing you must agree to all these policies.'; $string['newpolicy'] = 'New policy'; $string['newversion'] = 'New version'; +$string['noactivepolicies'] = 'There are no policies with an active version.'; $string['nofiltersapplied'] = 'No filters applied'; $string['nopermissiontoagreedocs'] = 'No permission to agree to the policies'; $string['nopermissiontoagreedocs_desc'] = 'Sorry, you do not have the required permissions to agree to the policies.
You will not be able to use this site until the following policies are agreed:'; diff --git a/admin/tool/policy/lib.php b/admin/tool/policy/lib.php index 1fbe958cfca..62919d38b63 100644 --- a/admin/tool/policy/lib.php +++ b/admin/tool/policy/lib.php @@ -104,9 +104,12 @@ function tool_policy_standard_footer_html() { $output = ''; if (!empty($CFG->sitepolicyhandler) && $CFG->sitepolicyhandler == 'tool_policy') { - $url = (new moodle_url('/admin/tool/policy/viewall.php'))->out(); - $output .= html_writer::link($url, get_string('userpolicysettings', 'tool_policy')); - $output = html_writer::div($output, 'policiesfooter'); + $policies = api::get_current_versions_ids(); + if (!empty($policies)) { + $url = (new moodle_url('/admin/tool/policy/viewall.php'))->out(); + $output .= html_writer::link($url, get_string('userpolicysettings', 'tool_policy')); + $output = html_writer::div($output, 'policiesfooter'); + } } return $output; diff --git a/admin/tool/policy/templates/page_viewalldoc.mustache b/admin/tool/policy/templates/page_viewalldoc.mustache index d25e40c8978..89812ffa07b 100644 --- a/admin/tool/policy/templates/page_viewalldoc.mustache +++ b/admin/tool/policy/templates/page_viewalldoc.mustache @@ -58,6 +58,10 @@ +{{^policies }} + {{# str }} noactivepolicies, tool_policy {{/ str }} +{{/policies }} + {{#policies }}