From 7b4737de26e360fc6d41b698fdb91613fcf0a751 Mon Sep 17 00:00:00 2001
From: Rajesh Taneja <rajesh@moodle.com>
Date: Wed, 21 Nov 2012 10:38:47 +0800
Subject: [PATCH 1/2] MDL-36736 course: Availability information will use hide
 class for hidding

---
 course/lib.php                    | 2 +-
 course/yui/toolboxes/toolboxes.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/course/lib.php b/course/lib.php
index 7d2ed99bfa2..79ea211e42d 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -1676,7 +1676,7 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
             } else if ($canviewhidden && !empty($CFG->enableavailability)) {
                 $visibilityclass = '';
                 if (!$mod->visible) {
-                    $visibilityclass = 'accesshide';
+                    $visibilityclass = 'hide';
                 }
                 $ci = new condition_info($mod);
                 $fullinfo = $ci->get_full_information();
diff --git a/course/yui/toolboxes/toolboxes.js b/course/yui/toolboxes/toolboxes.js
index eca09831e95..9aba50b988a 100644
--- a/course/yui/toolboxes/toolboxes.js
+++ b/course/yui/toolboxes/toolboxes.js
@@ -37,7 +37,7 @@ YUI.add('moodle-course-toolboxes', function(Y) {
         CONDITIONALHIDDEN : 'conditionalhidden',
         AVAILABILITYINFODIV : 'div.availabilityinfo',
         SHOWCLASS : 'editing_show',
-        ACCESSHIDECLASS : 'accesshide'
+        HIDECLASS : 'hide'
     };
 
     /**
@@ -99,7 +99,7 @@ YUI.add('moodle-course-toolboxes', function(Y) {
             var availabilityinfo = element.one(CSS.AVAILABILITYINFODIV);
 
             if (availabilityinfo) {
-                availabilityinfo.toggleClass(CSS.ACCESSHIDECLASS);
+                availabilityinfo.toggleClass(CSS.HIDECLASS);
             }
             return value;
         },

From 588b94ac65c5d819a1baffc7a8f4c7852bd89ed2 Mon Sep 17 00:00:00 2001
From: Rajesh Taneja <rajesh@moodle.com>
Date: Wed, 21 Nov 2012 10:49:05 +0800
Subject: [PATCH 2/2] MDL-36736 course: Availability information should not be
 visible for hidden modules

If user is viewing hidden module, availability information should only be visible to
user when editing and module is visible. If editing and module is hidden, then hide
availablilty information as it's invalid.
When user is not editing and activity is hidden then don't add availability information.
---
 course/lib.php | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/course/lib.php b/course/lib.php
index 79ea211e42d..c0b59845c00 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -1674,17 +1674,20 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
             if (!$mod->uservisible) {
                 echo '<div class="availabilityinfo">'.$mod->availableinfo.'</div>';
             } else if ($canviewhidden && !empty($CFG->enableavailability)) {
-                $visibilityclass = '';
-                if (!$mod->visible) {
-                    $visibilityclass = 'hide';
-                }
-                $ci = new condition_info($mod);
-                $fullinfo = $ci->get_full_information();
-                if($fullinfo) {
-                    echo '<div class="availabilityinfo '.$visibilityclass.'">'.get_string($mod->showavailability
-                        ? 'userrestriction_visible'
-                        : 'userrestriction_hidden','condition',
-                        $fullinfo).'</div>';
+                // Don't add availability information if user is not editing and activity is hidden.
+                if ($mod->visible || $PAGE->user_is_editing()) {
+                    $hidinfoclass = '';
+                    if (!$mod->visible) {
+                        $hidinfoclass = 'hide';
+                    }
+                    $ci = new condition_info($mod);
+                    $fullinfo = $ci->get_full_information();
+                    if($fullinfo) {
+                        echo '<div class="availabilityinfo '.$hidinfoclass.'">'.get_string($mod->showavailability
+                            ? 'userrestriction_visible'
+                            : 'userrestriction_hidden','condition',
+                            $fullinfo).'</div>';
+                    }
                 }
             }