Now, the repository is able to set the resource->name if

it haven't been manuall defined. Part of MDL-10878.

Merged from MOODLE_18_STABLE

diff --git a/mod/resource/type/ims/finder.php b/mod/resource/type/ims/finder.php
index e480462fd71fbd1b90faa8fbe5a37dae9c07b80c..da688179296db281f09c27a9626d2d7f2be754b4 100644 (file)
--- a/mod/resource/type/ims/finder.php
+++ b/mod/resource/type/ims/finder.php
@@ -11,6 +11,7 @@
 /// Directory to browse, inside repository. Starts on ''.    
     $directory = optional_param ('directory', '', PARAM_PATH);
     $choose  = optional_param('choose', 'id_reference_value', PARAM_FILE);
+    $name  = optional_param('name', 'id_name', PARAM_FILE);
     
 /// Get the language strings needed
     $strdeployall = get_string('deployall','resource');
@@ -74,20 +75,23 @@
     ?>
     <script type="text/javascript">
         //<![CDATA[
-        function set_value(txt) {
-            opener.document.getElementById('<?php echo $choose ?>').value = txt;
-            window.close();
+        function set_opener_value(field, txt, force) {
+            if (opener.document.getElementById(field)) {
+                if (force || !opener.document.getElementById(field).value) {
+                    opener.document.getElementById(field).value = txt;
+                }
+            }
         }
         //]]>
     </script>
     <?php
-    echo '<ul style="list-style:none;padding:10px;margin:0px;">';  
+    echo '<ul style="list-style:none;padding:10px;margin:0px;">';
     if ($items != array()) {
-        
+
         foreach ($items as $item) {
             if ($item->type == 'deployed') {
                 echo "<li><img src=\"images/ims.gif\" alt=\"IMS CP Package\" /> $item->name" .
-                     "(<a onclick=\"return set_value('#$item->path')\" href=\"#\">$strchoose</a>) " .
+                     "(<a onclick=\"set_opener_value('$choose', '#$item->path', true); set_opener_value('$name', '$item->name', false); window.close()\" href=\"#\">$strchoose</a>) " .
                      "(<a href=\"preview.php?directory=$item->path&amp;choose=$choose\">$strpreview</a>)</li>\n";
             }
             else if ($item->type == 'not deployed') {