fixed the forwarding of an embed upload form

diff --git a/mod/embed/views/default/js/embed/embed.php b/mod/embed/views/default/js/embed/embed.php
index 37246ee8a70d7b1c1ab7ec347a25194b8832683f..6d4e2e4ea8811f11a6b255193d983a9210f36973 100644 (file)
--- a/mod/embed/views/default/js/embed/embed.php
+++ b/mod/embed/views/default/js/embed/embed.php
@@ -79,9 +79,8 @@ elgg.embed.submit = function(event) {
                                        elgg.system_message(response.system_messages.success);
                                }
                                if (response.status >= 0) {
-                                       // @todo - really this should forward to what the registered defined
-                                       // For example, forward to images tab if an image was uploaded
-                                       var url = elgg.config.wwwroot + 'embed/embed';
+                                       var forward = $('input[name=embed_forward]').val();
+                                       var url = elgg.normalize_url('embed/tab/' + forward);
                                        $('.embed-wrapper').parent().load(url);
                                }
                        }

diff --git a/mod/file/views/default/embed/file/content.php b/mod/file/views/default/embed/file/content.php
deleted file mode 100644 (file)
index eadcd1a..0000000
--- a/mod/file/views/default/embed/file/content.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * List files available for upload
- */
-
-$active_section = elgg_extract('active_section', $vars);
-
-$options = array(
-       'owner_guid' => elgg_get_logged_in_user_guid(),
-       'type_subtype_pair' => array('object' => 'file'),
-       'count' => true
-);
-
-$count = elgg_get_entities($options);
-
-if ($count) {
-       echo "<div class='embed_modal_$active_section'>";
-
-       unset($options['count']);
-       $items = elgg_get_entities($options);
-
-       foreach ($items as $item) {
-
-               // different entity types have different title attribute names.
-               $title = isset($item->name) ? $item->name : $item->title;
-               // don't let it be too long
-               $title = elgg_get_excerpt($title);
-
-               $author_text = elgg_echo('byline', array($owner->name));
-               $date = elgg_view_friendly_time($item->time_created);
-
-               $subtitle = "$author_text $date";
-
-               $icon = "<img src=\"{$item->getIconURL($icon_size)}\" />";
-
-               $embed_code = elgg_view('output/url', array(
-                       'href' => $item->getURL(),
-                       'title' => $title,
-                       'text' => $icon,
-                       'encode_text' => FALSE
-               ));
-
-               $item_icon = elgg_view_entity_icon($item, $icon_size);
-
-               $params = array(
-                       'title' => $title,
-                       'entity' => $item,
-                       'subtitle' => $subtitle,
-                       'tags' => FALSE,
-               );
-               $list_body = elgg_view('object/elements/summary', $params);
-
-               // @todo JS 1.8: is this approach better than inline js?
-               echo "<div class=\"embed_data\" id=\"embed_{$item->getGUID()}\">" . elgg_view_image_block($item_icon, $list_body) . '</div>';
-               echo "<script type=\"text/javascript\">
-                       $('#embed_{$item->getGUID()}').data('embed_code', " . json_encode($embed_code) . ");
-               </script>";
-       }
-
-       echo '</div>';
-}
\ No newline at end of file

diff --git a/mod/file/views/default/embed/file_upload/content.php b/mod/file/views/default/embed/file_upload/content.php
index 13c18f745b8ce73a4f268984c1ccc5e0af3c0c23..a530b3194ea998ded29ada3c9350a73da1582bf8 100644 (file)
--- a/mod/file/views/default/embed/file_upload/content.php
+++ b/mod/file/views/default/embed/file_upload/content.php
@@ -9,7 +9,12 @@ $form_vars = array(
 );
 $upload_content = elgg_view_form('file/upload', $form_vars);
 
-echo "<div class='mbm'>" . elgg_echo('embed:upload_type') . "$input</div>";
 echo "<div class='embed-upload'>";
 echo $upload_content;
-echo "</div>";
\ No newline at end of file
+echo "</div>";
+
+// the tab we want to be forwarded to after upload is complete
+echo elgg_view('input/hidden', array(
+       'name' => 'embed_forward',
+       'value' => 'file',
+));
\ No newline at end of file