jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/387506 )
Change subject: Added DB check for "create replacement" checkbox
......................................................................
Added DB check for "create replacement" checkbox
Change-Id: Iabe84cd98d886f7e8e793284dcd70b357b82fae4
---
M specials/CargoRecreateData.php
1 file changed, 9 insertions(+), 2 deletions(-)
Approvals:
Yaron Koren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/specials/CargoRecreateData.php b/specials/CargoRecreateData.php
index d6654d0..5b4d7b1 100644
--- a/specials/CargoRecreateData.php
+++ b/specials/CargoRecreateData.php
@@ -100,8 +100,15 @@
// Simple form.
$text .= '<div id="recreateDataCanvas">' . "\n";
if ( $tableExists ) {
- $text .= Html::rawElement( 'p', null, Html::check(
'createReplacement', true, array( 'id' => 'createReplacement' ) ) .
- ' ' . "Recreate data into a replacement table,
keeping the old one for querying" );
+ // Possibly disable checkbox, to avoid problems if the
+ // DB hasn't been updated for version 1.5.
+ $indexExists = $dbw->indexExists( 'cargo_tables',
'cargo_tables_template_id' );
+ if ( !$indexExists ) {
+ $text .= '<p><em>The checkbox intended to go
here is temporarily disabled; please run <tt>update.php</tt> to see
it.</em></p>';
+ } else {
+ $text .= Html::rawElement( 'p', null,
Html::check( 'createReplacement', true, array( 'id' => 'createReplacement' ) ) .
+ ' ' . "Recreate data into a replacement
table, keeping the old one for querying" );
+ }
}
$msg = $tableExists ? 'cargo-recreatedata-desc' :
'cargo-recreatedata-createdata';
$text .= Html::element( 'p', null, $this->msg( $msg )->parse()
);
--
To view, visit https://gerrit.wikimedia.org/r/387506
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iabe84cd98d886f7e8e793284dcd70b357b82fae4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren <yaro...@gmail.com>
Gerrit-Reviewer: Yaron Koren <yaro...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
