Merge b23ba58836 into 01125b8c52

main/exercise/exercise.class.php

@@ -9909,6 +9909,14 @@ class Exercise
                                 );
                             } else {
                                 if ($row['active'] == 0 || $visibility == 0) {
+                                    $visibleOnBaseCourse = api_get_item_visibility(
+                                        $courseInfo,
+                                        TOOL_QUIZ,
+                                        $row['iid'],
+                                        0
+                                    );
+
+                                    if ($visibleOnBaseCourse) {
                                         $visibility = Display::url(
                                             Display::return_icon(
                                                 'invisible.png',
@@ -9918,6 +9926,12 @@ class Exercise
                                             ),
                                             'exercise.php?'.api_get_cidreq().'&choice=enable&sec_token='.$token.'&exerciseId='.$row['iid']
                                         );
+                                    } else {
+                                        $visibility = Display::return_icon(
+                                            'invisible.png',
+                                            get_lang('Activate')
+                                        );
+                                    }
                                 } else {
                                     // else if not active
                                     $visibility = Display::url(

main/exercise/exercise.php

@@ -266,6 +266,18 @@ if (!empty($action) && $is_allowedToEdit) {
                         break;
                     }
 
+                    $visibleOnBaseCourse = api_get_item_visibility(
+                        $courseInfo,
+                        TOOL_QUIZ,
+                        $objExerciseTmp->iid,
+                        0
+                    );
+
+                    if (!$visibleOnBaseCourse) {
+                        Display::addFlash(Display::return_message(get_lang('CanNotHide') . ' ' . $objExerciseTmp->name, 'error'));
+                        break;
+                    }
+
                     // enables an exercise
                     if (empty($sessionId)) {
                         $objExerciseTmp->enable();