Awight has uploaded a new change for review.
https://gerrit.wikimedia.org/r/236070
Change subject: Disable some unused banner mixin form elements
......................................................................
Disable some unused banner mixin form elements
This could cause confusion with the new campaign mixin feature.
Change-Id: Ie730c00c8d9d5ebc8a9b671e789fe6a562bd3da8
---
M i18n/en.json
M special/SpecialCentralNoticeBanners.php
2 files changed, 2 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/70/236070/1
diff --git a/i18n/en.json b/i18n/en.json
index d910250..f7fd0f4 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -90,7 +90,7 @@
"centralnotice-settings": "Settings",
"centralnotice-edit-template": "Edit banner",
"centralnotice-edit-template-summary": "To create a localisable
message, enclose a hyphenated string in three curly brackets, e.g.
{{{jimbo-quote}}}.",
- "centralnotice-edit-template-magicwords": "Magic words provided by
banner mixins: $1",
+ "centralnotice-edit-template-magicwords": "Magic words provided by
mixins: $1",
"centralnotice-message": "Message",
"centralnotice-message-not-set": "Message not set",
"centralnotice-campaigns-using-banner": "Campaigns using this banner",
diff --git a/special/SpecialCentralNoticeBanners.php
b/special/SpecialCentralNoticeBanners.php
index 1e33234..7ef7005 100644
--- a/special/SpecialCentralNoticeBanners.php
+++ b/special/SpecialCentralNoticeBanners.php
@@ -413,7 +413,7 @@
}
protected function generateBannerEditForm() {
- global $wgCentralNoticeBannerMixins,
$wgNoticeUseTranslateExtension, $wgNoticeFundraisingUrl, $wgLanguageCode;
+ global $wgNoticeUseTranslateExtension, $wgNoticeFundraisingUrl,
$wgLanguageCode;
$languages = Language::fetchLanguageNames(
$this->getLanguage()->getCode() );
array_walk( $languages, function( &$val, $index ) { $val =
"$index - $val"; } );
@@ -479,20 +479,6 @@
'options' => $availableDevices,
'default' => $assignedDevices,
'cssclass' => 'separate-form-element',
- );
-
- $mixinNames = array_keys( $wgCentralNoticeBannerMixins );
- $availableMixins = array_combine( $mixinNames, $mixinNames );
- $selectedMixins = array_keys( $banner->getMixins() );
- $formDescriptor['mixins'] = array(
- 'section' => 'settings',
- 'type' => 'multiselect',
- 'disabled' => !$this->editable,
- 'label-message' => 'centralnotice-banner-mixins',
- 'help-message' => 'centralnotice-banner-mixins-help',
- 'cssclass' => 'separate-form-element',
- 'options' => $availableMixins,
- 'default' => $selectedMixins,
);
/* --- Translatable Messages Section --- */
@@ -856,7 +842,6 @@
$banner->setPriorityLanguages( $prioLang );
$banner->setBodyContent( $formData[ 'banner-body' ] );
- $banner->setMixins( $formData['mixins'] );
$banner->save( $this->getUser(), $summary );
return null;
--
To view, visit https://gerrit.wikimedia.org/r/236070
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie730c00c8d9d5ebc8a9b671e789fe6a562bd3da8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Awight <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
