fixed wrong disabledif conditions in resource subtypes - sorry

diff --git a/mod/resource/type/file/resource.class.php b/mod/resource/type/file/resource.class.php
index f76f3bc068073663b8df5f7c958b43446b312854..89f90392683098349de975feb2b454bfa00bf029 100644 (file)
--- a/mod/resource/type/file/resource.class.php
+++ b/mod/resource/type/file/resource.class.php
@@ -583,18 +583,18 @@ function setup_elements(&$mform) {
 
     $mform->addElement('checkbox', 'framepage', get_string('frameifpossible', 'resource'));
     $mform->setDefault('framepage', 0);
-    $mform->disabledIf('framepage', 'windowpopup', 'eq', 0);
+    $mform->disabledIf('framepage', 'windowpopup', 'eq', 1);
     $mform->setAdvanced('framepage');
 
     foreach ($RESOURCE_WINDOW_OPTIONS as $option) {
         if ($option == 'height' or $option == 'width') {
             $mform->addElement('text', $option, get_string('new'.$option, 'resource'), array('size'=>'4'));
             $mform->setDefault($option, $CFG->{'resource_popup'.$option});
-            $mform->disabledIf($option, 'windowpopup', 'eq', 1);
+            $mform->disabledIf($option, 'windowpopup', 'eq', 0);
         } else {
             $mform->addElement('checkbox', $option, get_string('new'.$option, 'resource'));
             $mform->setDefault($option, $CFG->{'resource_popup'.$option});
-            $mform->disabledIf($option, 'windowpopup', 'eq', 1);
+            $mform->disabledIf($option, 'windowpopup', 'eq', 0);
         }
         $mform->setAdvanced($option);
     }

diff --git a/mod/resource/type/html/resource.class.php b/mod/resource/type/html/resource.class.php
index a60c16f1d5a32946e56ab309975c08daaaaa4965..1e192ab581b6e3d984b870481db8b464f1e977bd 100644 (file)
--- a/mod/resource/type/html/resource.class.php
+++ b/mod/resource/type/html/resource.class.php
@@ -158,18 +158,18 @@ function setup_elements(&$mform) {
 
     $mform->addElement('checkbox', 'blockdisplay', get_string('showcourseblocks', 'resource'));
     $mform->setDefault('blockdisplay', 0);
-    $mform->disabledIf('blockdisplay', 'windowpopup', 'eq', '0');
+    $mform->disabledIf('blockdisplay', 'windowpopup', 'eq', '1');
     $mform->setAdvanced('blockdisplay');
 
     foreach ($RESOURCE_WINDOW_OPTIONS as $option) {
         if ($option == 'height' or $option == 'width') {
             $mform->addElement('text', $option, get_string('new'.$option, 'resource'), array('size'=>'4'));
             $mform->setDefault($option, $CFG->{'resource_popup'.$option});
-            $mform->disabledIf($option, 'windowpopup', 'eq', '1');
+            $mform->disabledIf($option, 'windowpopup', 'eq', '0');
         } else {
             $mform->addElement('checkbox', $option, get_string('new'.$option, 'resource'));
             $mform->setDefault($option, $CFG->{'resource_popup'.$option});
-            $mform->disabledIf($option, 'windowpopup', 'eq', '1');
+            $mform->disabledIf($option, 'windowpopup', 'eq', '0');
         }
         $mform->setAdvanced($option);
     }

diff --git a/mod/resource/type/ims/resource.class.php b/mod/resource/type/ims/resource.class.php
index 4184649b043ca642e8dbb0158750880d4391a8ef..47e19f5c7e61b010babac2ead7e9b99c0b3b2fd8 100644 (file)
--- a/mod/resource/type/ims/resource.class.php
+++ b/mod/resource/type/ims/resource.class.php
@@ -641,11 +641,11 @@ class resource_ims extends resource_base {
             if ($option == 'height' or $option == 'width') {
                 $mform->addElement('text', $option, get_string('new'.$option, 'resource'), array('size'=>'4'));
                 $mform->setDefault($option, $CFG->{'resource_popup'.$option});
-                $mform->disabledIf($option, 'windowpopup', 'eq', 1);
+                $mform->disabledIf($option, 'windowpopup', 'eq', 0);
             } else {
                 $mform->addElement('checkbox', $option, get_string('new'.$option, 'resource'));
                 $mform->setDefault($option, $CFG->{'resource_popup'.$option});
-                $mform->disabledIf($option, 'windowpopup', 'eq', 1);
+                $mform->disabledIf($option, 'windowpopup', 'eq', 0);
             }
             $mform->setAdvanced($option);
         }

diff --git a/mod/resource/type/repository/resource.class.php b/mod/resource/type/repository/resource.class.php
index 642e203e94f1b685cb58ed7c7c7a1b07b76dadce..7d3da0ac839d3d6c20a9079782aedec0173899ba 100644 (file)
--- a/mod/resource/type/repository/resource.class.php
+++ b/mod/resource/type/repository/resource.class.php
@@ -576,18 +576,18 @@ function setup_elements(&$mform) {
 
     $mform->addElement('checkbox', 'framepage', get_string('frameifpossible', 'resource'));
     $mform->setDefault('framepage', 0);
-    $mform->disabledIf('framepage', 'windowpopup', 'eq', 0);
+    $mform->disabledIf('framepage', 'windowpopup', 'eq', 1);
     $mform->setAdvanced('framepage');
 
     foreach ($RESOURCE_WINDOW_OPTIONS as $option) {
         if ($option == 'height' or $option == 'width') {
             $mform->addElement('text', $option, get_string('new'.$option, 'resource'), array('size'=>'4'));
             $mform->setDefault($option, $CFG->{'resource_popup'.$option});
-            $mform->disabledIf($option, 'windowpopup', 'eq', 1);
+            $mform->disabledIf($option, 'windowpopup', 'eq', 0);
         } else {
             $mform->addElement('checkbox', $option, get_string('new'.$option, 'resource'));
             $mform->setDefault($option, $CFG->{'resource_popup'.$option});
-            $mform->disabledIf($option, 'windowpopup', 'eq', 1);
+            $mform->disabledIf($option, 'windowpopup', 'eq', 0);
         }
         $mform->setAdvanced($option);
     }

diff --git a/mod/resource/type/text/resource.class.php b/mod/resource/type/text/resource.class.php
index b619bc0f805f698ba239042b02f57a62542b141c..1e6c420a2c1ad864c7bda1604e0e0152516663b0 100644 (file)
--- a/mod/resource/type/text/resource.class.php
+++ b/mod/resource/type/text/resource.class.php
@@ -165,18 +165,18 @@ function setup_elements(&$mform) {
 
     $mform->addElement('checkbox', 'blockdisplay', get_string('showcourseblocks', 'resource'));
     $mform->setDefault('blockdisplay', 0);
-    $mform->disabledIf('blockdisplay', 'windowpopup', 'eq', 0);
+    $mform->disabledIf('blockdisplay', 'windowpopup', 'eq', 1);
     $mform->setAdvanced('blockdisplay');
 
     foreach ($RESOURCE_WINDOW_OPTIONS as $option) {
         if ($option == 'height' or $option == 'width') {
             $mform->addElement('text', $option, get_string('new'.$option, 'resource'), array('size'=>'4'));
             $mform->setDefault($option, $CFG->{'resource_popup'.$option});
-            $mform->disabledIf($option, 'windowpopup', 'eq', 1);
+            $mform->disabledIf($option, 'windowpopup', 'eq', 0);
         } else {
             $mform->addElement('checkbox', $option, get_string('new'.$option, 'resource'));
             $mform->setDefault($option, $CFG->{'resource_popup'.$option});
-            $mform->disabledIf($option, 'windowpopup', 'eq', 1);
+            $mform->disabledIf($option, 'windowpopup', 'eq', 0);
         }
         $mform->setAdvanced($option);
     }