From 8f182eef86913ead8e4f9aff014fbbd27446d3ba Mon Sep 17 00:00:00 2001 From: mjollnir_ Date: Tue, 5 Aug 2008 17:39:35 +0000 Subject: [PATCH] MDL-15935 - print a different message to the user when their portfolio export has been queued --- lang/en_utf8/portfolio.php | 1 + lib/portfoliolib.php | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/lang/en_utf8/portfolio.php b/lang/en_utf8/portfolio.php index 856d624be9..82bc41382e 100644 --- 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 ac67a59d5b..117cdc29e3 100644 --- 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 '' . get_string('returntowhereyouwere', 'portfolio') . '
'; } -- 2.39.5