MDL-15935 - print a different message to the user when their portfolio export has...

diff --git a/lang/en_utf8/portfolio.php b/lang/en_utf8/portfolio.php
index 856d624be9f6619e5be2efb1d8e9a2c20b0224ff..82bc41382eee7633b401b800a956f22a292ecac4 100644 (file)
--- a/lang/en_utf8/portfolio.php
+++ b/lang/en_utf8/portfolio.php
@@ -20,6 +20,7 @@ $string['enabled'] = 'Enable portfolios';
 $string['enableddesc'] = 'This will allow administrators to configure remote systems for users to export content to';
 $string['exporting'] = 'Exporting to portfolio';
 $string['exportcomplete'] = 'Portfolio export complete!';
+$string['exportqueued'] = 'Portfolio export has been successfully queued for transfer';
 $string['exportedpreviously'] = 'Previous exports';
 $string['failedtosendpackage'] = 'Failed to send your data to the selected portfolio system!';
 $string['format_file'] = 'File';

diff --git a/lib/portfoliolib.php b/lib/portfoliolib.php
index ac67a59d5bdb6aff5b3b6da1ce4a61f7e9dedfde..117cdc29e3e59ef4c4c1ace52a02640083ca202a 100644 (file)
--- a/lib/portfoliolib.php
+++ b/lib/portfoliolib.php
@@ -1924,10 +1924,9 @@ final class portfolio_exporter {
         global $SESSION;
         $wait = $this->instance->get_export_config('wait');
         if (empty($wait)) {
-            error_log(print_r(serialize($this), true));
             events_trigger('portfolio_send', $this);
             unset($SESSION->portfolio);
-            return $this->process_stage_finished();
+            return $this->process_stage_finished(true);
         }
         return true;
     }
@@ -2001,15 +2000,18 @@ final class portfolio_exporter {
     *
     * @return boolean whether or not to process the next stage. this is important as the control function is called recursively.
     */
-    public function process_stage_finished() {
+    public function process_stage_finished($queued=false) {
         global $SESSION;
         $returnurl = $this->caller->get_return_url();
         $continueurl = $this->instance->get_continue_url();
         $extras = $this->instance->get_extra_finish_options();
 
         $this->print_header();
-        //@todo do something different here if we're queueing.
-        print_heading(get_string('exportcomplete', 'portfolio'));
+        if ($queued) {
+            print_heading(get_string('exportqueued', 'portfolio'));
+        } else {
+            print_heading(get_string('exportcomplete', 'portfolio'));
+        }
         if ($returnurl) {
             echo '<a href="' . $returnurl . '">' . get_string('returntowhereyouwere', 'portfolio') . '</a><br />';
         }