Merge branch 'MDL-29924-22' of git://github.com/FMCorz/moodle into MO…

…ODLE_22_STABLE
moodle · May 25, 2012 · adb9f1a · adb9f1a
2 parents 2c1dda9 + 3dc794a
commit adb9f1a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/filter/glossary/yui/autolinker/autolinker.js b/filter/glossary/yui/autolinker/autolinker.js
@@ -70,7 +70,8 @@ YUI.add('moodle-filter_glossary-autolinker', function(Y) {
                     this.overlay.hide(); //hide progress indicator
 
                     for (key in data.entries) {
-                        new M.core.alert({title:data.entries[key].concept, message:data.entries[key].definition, lightbox:false});
+                        definition = data.entries[key].definition + data.entries[key].attachments
+                        new M.core.alert({title:data.entries[key].concept, message:definition, lightbox:false});
                     }
 
                     return true;

diff --git a/mod/glossary/showentry_ajax.php b/mod/glossary/showentry_ajax.php
@@ -70,6 +70,12 @@
         $options->context = $context;
         $entries[$key]->definition = format_text($definition, $entry->definitionformat, $options);
 
+        $entries[$key]->attachments = '';
+        if (!empty($entries[$key]->attachment)) {
+            $attachments = glossary_print_attachments($entry, $cm, 'html');
+            $entries[$key]->attachments = html_writer::tag('p', $attachments);
+        }
+
         $entries[$key]->footer = "<p style=\"text-align:right\">&raquo;&nbsp;<a href=\"$CFG->wwwroot/mod/glossary/view.php?g=$entry->glossaryid\">".format_string($entry->glossaryname,true)."</a></p>";
         add_to_log($entry->courseid, 'glossary', 'view entry', "showentry.php?eid=$entry->id", $entry->id, $entry->cmid);
     }