Ejegg has submitted this change and it was merged.
Change subject: Simplify Campaign editor banner list
......................................................................
Simplify Campaign editor banner list
Since we've disabled banner previewing, there's no reason to make lots of
queries to build the pager. Just link to the banners.
Change-Id: I3e4ac18eeccd4cf111e942003e06d805a236293a
---
M includes/BannerRenderer.php
M special/SpecialCentralNotice.php
2 files changed, 10 insertions(+), 4 deletions(-)
Approvals:
Ejegg: Looks good to me, approved
diff --git a/includes/BannerRenderer.php b/includes/BannerRenderer.php
index 36fcdca..8b64845 100644
--- a/includes/BannerRenderer.php
+++ b/includes/BannerRenderer.php
@@ -52,6 +52,15 @@
);
}
+ // TODO: consolidate with above function
+ public static function linkToBanner( $name ) {
+ return Linker::link(
+ SpecialPage::getTitleFor( 'CentralNoticeBanners',
"edit/{$name}" ),
+ htmlspecialchars( $name ),
+ array( 'class' => 'cn-banner-title' )
+ );
+ }
+
/**
* Render the banner as an html fieldset
*/
diff --git a/special/SpecialCentralNotice.php b/special/SpecialCentralNotice.php
index 893bacb..86d0cc9 100644
--- a/special/SpecialCentralNotice.php
+++ b/special/SpecialCentralNotice.php
@@ -1018,11 +1018,8 @@
);
// Banner
- $banner = Banner::fromName( $row->tmp_name );
- $renderer = new BannerRenderer( $this->getContext(),
$banner );
$htmlOut .= Xml::tags( 'td', array( 'valign' => 'top' ),
- $renderer->linkTo() . '<br/>' .
- $renderer->previewFieldSet()
+ BannerRenderer::linkToBanner( $row->tmp_name )
);
$htmlOut .= Xml::closeElement( 'tr' );
--
To view, visit https://gerrit.wikimedia.org/r/177466
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3e4ac18eeccd4cf111e942003e06d805a236293a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: Mwalker <[email protected]>
Gerrit-Reviewer: Ssmith <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
