MDL-15402: when an instance is reaonly, the administrator cannot delete it but should...

diff --git a/admin/repositoryinstance.php b/admin/repositoryinstance.php
index d5a2aff2ff584d102b7120f58fa6afa747ae84f2..812489032c0c16f5664e4296e59cc1651e1daee2 100644 (file)
--- a/admin/repositoryinstance.php
+++ b/admin/repositoryinstance.php
@@ -43,10 +43,6 @@ $return = true;
 if (!empty($edit) || !empty($new)) {
     if (!empty($edit)) {
         $instance = repository_get_instance($edit);
-        //if you try to edit an instance set as readonly, display an error message
-        if ($instance->readonly) {
-            throw new repository_exception('readonlyinstance', 'repository');
-        }
         $instancetype = repository_get_type_by_id($instance->typeid);
         $classname = 'repository_' . $instancetype->get_typename();
         $configs  = $instance->get_instance_option_names();
@@ -72,8 +68,10 @@ if (!empty($edit) || !empty($new)) {
         if ($edit) {
             $settings = array();
             $settings['name'] = $fromform->name;
-            foreach($configs as $config) {
-                $settings[$config] = $fromform->$config;
+            if (!$instance->readonly) {
+                foreach($configs as $config) {
+                    $settings[$config] = $fromform->$config;
+                }
             }
             $success = $instance->set_option($settings);
         } else {

diff --git a/repository/lib.php b/repository/lib.php
index 62cf8ac6bd6c661c999a779580b0b29a66308c0a..8d3efc7f8c53a159d18d2746127a12b6e57f4669 100644 (file)
--- a/repository/lib.php
+++ b/repository/lib.php
@@ -1248,26 +1248,36 @@ final class repository_instance_form extends moodleform {
         $mform->addElement('text', 'name', get_string('name'), 'maxlength="100" size="30"');
         $mform->addRule('name', $strrequired, 'required', null, 'client');
 
-        //add fields
-       if (!$this->instance) {
-            $result = repository_static_function($this->plugin, 'instance_config_form', $mform);
-        } else {
-            $result = $this->instance->instance_config_form($mform);
-        }
-        
-        // and set the data if we have some.
-        if ($this->instance) {
-            $data = array();
-            $data['name'] = $this->instance->name;
-            foreach ($this->instance->get_instance_option_names() as $config) {
-                if (!empty($this->instance->$config)) {
-                    $data[$config] = $this->instance->$config;
-                } else {
-                    $data[$config] = '';
+        if (!$this->instance->readonly) {
+            //add fields
+            if (!$this->instance) {
+                $result = repository_static_function($this->plugin, 'instance_config_form', $mform);
+            } else {
+                $result = $this->instance->instance_config_form($mform);
+            }
+
+            // and set the data if we have some.
+            if ($this->instance) {
+                $data = array();
+                $data['name'] = $this->instance->name;
+                foreach ($this->instance->get_instance_option_names() as $config) {
+                    if (!empty($this->instance->$config)) {
+                        $data[$config] = $this->instance->$config;
+                     } else {
+                        $data[$config] = '';
+                     }
                 }
+                $this->set_data($data);
             }
-            $this->set_data($data);
         }
+        else {
+             if ($this->instance) {
+                $data = array();
+                $data['name'] = $this->instance->name;
+                $this->set_data($data);
+             }
+        }
+
         $this->add_action_buttons(true, get_string('save','repository'));
     }
 
@@ -1396,8 +1406,8 @@ function repository_display_instances_list($context, $typename = null) {
     foreach ($instances as $i) {
         $settings = '';
         $delete = '';
+        $settings .= '<a href="' . $baseurl . '&amp;type='.$typename.'&amp;edit=' . $i->id . '">' . $settingsstr . '</a>' . "\n";
         if (!$i->readonly) {
-            $settings .= '<a href="' . $baseurl . '&amp;type='.$typename.'&amp;edit=' . $i->id . '">' . $settingsstr . '</a>' . "\n";
             $delete .= '<a href="' . $baseurl . '&amp;type='.$typename.'&amp;delete=' .  $i->id . '">' . $deletestr . '</a>' . "\n";
         }