- Patch #606190 by dww, noahb, sun: improve handling of database schema updates in update manager workflow.

merge-requests/26/head
Dries Buytaert 2010-04-10 09:49:49 +00:00
parent 459d623467
commit c80481634f
2 changed files with 9 additions and 5 deletions

View File

@ -81,10 +81,8 @@ class ModuleUpdater extends Updater implements DrupalUpdaterInterface {
}
public function postUpdateTasks() {
// @todo: If there are schema updates.
return array(
l(t('Run database updates for !project', array('!project' => $this->title)), 'update.php'),
);
// We don't want to check for DB updates here, we do that once for all
// updated modules on the landing page.
}
}

View File

@ -154,7 +154,9 @@ function update_authorize_batch_copy_project($project, $updater_name, $local_url
}
_update_batch_create_message($context['results']['log'][$project], t('Installed %project_name successfully', array('%project_name' => $project)));
$context['results']['tasks'] += $tasks;
if (!empty($tasks)) {
$context['results']['tasks'] += $tasks;
}
// This particular operation is now complete, even though the batch might
// have other operations to perform.
@ -206,6 +208,10 @@ function update_authorize_update_batch_finished($success, $results) {
'type' => 'error',
);
}
// Since we're doing an update of existing code, always add a task for
// running update.php.
$results['tasks'][] = t('Your modules have been downloaded and updated.');
$results['tasks'][] = t('<a href="@update">Run database updates</a>', array('@update' => base_path() . 'update.php'));
// Set all these values into the SESSION so authorize.php can display them.
$_SESSION['authorize_results']['success'] = $success;