jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/329715 )
Change subject: Clean up a few things in the Newsletter extension
......................................................................
Clean up a few things in the Newsletter extension
* Add and pass a reason parameter in the doUpdate() function in
NewsletterDeletionUpdate class
* Rename hint from IDatabase to more accurate Database in NewsletterTablePager
* Uppercase ID in $filterForm->setSubmitId() in SpecialNewsletters
Bug: T153096
Change-Id: I1e8cb528b1edd94deb41d973982f63ce7ec8c2ed
---
M i18n/en.json
M i18n/qqq.json
M includes/content/NewsletterDeletionUpdate.php
M includes/specials/SpecialNewsletters.php
M includes/specials/pagers/NewsletterTablePager.php
5 files changed, 7 insertions(+), 3 deletions(-)
Approvals:
01tonythomas: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 254874c..d738e4b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -71,6 +71,7 @@
"newsletter-manage-summary": "Summary of the change:",
"newsletter-delete": "Delete newsletter",
"newsletter-delete-failure": "\"$1\" newsletter could not be deleted.
Please try again.",
+ "newsletter-delete-log": "Newsletter \"$1\" has been deleted.",
"newsletter-subscribe": "Newsletter subscription management",
"newsletter-subscribe-text": "This interface allows you to subscribe to
\"$1\" newsletter. If you subscribe, you will receive notifications when new
issues of this newsletter are announced.",
"newsletter-do-subscribe": "Subscribe to this newsletter",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 368e9b4..20b6adc 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -78,6 +78,7 @@
"newsletter-manage-summary": "Edit summary for updating fields in
Special:Newsletter's manage form",
"newsletter-delete": "Header message shown on
Special:Newsletter/<id>/delete.\n\nSee also:\n*
{{msg-mw|newsletter-view}}\n*{{msg-mw|newsletter-subscribe}}",
"newsletter-delete-failure": "Error message shown on
Special:Newsletter/<id>/delete when the newsletter deletion
fails.\n\nParameters:\n* $1 - Newsletter name",
+ "newsletter-delete-log": "Default message passed to the logentry as a
comment when a newsletter is deleted in
NewsletterDeletionUpdate\n\nParameters:\n* $1 - Newsletter name",
"newsletter-subscribe": "Header message shown on
Special:Newsletter/<id>/subscribe.\n\nSee also:\n*
{{msg-mw|newsletter-delete}}\n*{{msg-mw|newsletter-view}}",
"newsletter-subscribe-text": "Introductory message shown on
Special:Newsletter/<id>/subscribe if the current user is not subscribed to the
newsletter.\n\nParameters:\n* $1 - Name of the newsletter for the specified id",
"newsletter-do-subscribe": "Label for button shown on
Special:Newsletter/<id>/subscribe. Adds the user as a subscriber to the
newsletter when clicked on.",
diff --git a/includes/content/NewsletterDeletionUpdate.php
b/includes/content/NewsletterDeletionUpdate.php
index 6637d4b..69a3042 100644
--- a/includes/content/NewsletterDeletionUpdate.php
+++ b/includes/content/NewsletterDeletionUpdate.php
@@ -14,8 +14,10 @@
public function __construct( $newsletterName ) {
$this->newsletter = Newsletter::newFromName( $newsletterName );
}
+
public function doUpdate() {
+ $reason = wfMessage( 'newsletter-delete-log',
$this->newsletter->getName() )->text();
$store = NewsletterStore::getDefaultInstance();
- $store->deleteNewsletter( $this->newsletter );
+ $store->deleteNewsletter( $this->newsletter, $reason );
}
}
\ No newline at end of file
diff --git a/includes/specials/SpecialNewsletters.php
b/includes/specials/SpecialNewsletters.php
index 27b3b91..dc69b2d 100644
--- a/includes/specials/SpecialNewsletters.php
+++ b/includes/specials/SpecialNewsletters.php
@@ -51,7 +51,7 @@
$this->getContext()
);
$filterForm->setId( 'mw-newsletter-filter-form' );
- $filterForm->setSubmitId( 'mw-newsletter-filter-submit'
);
+ $filterForm->setSubmitID( 'mw-newsletter-filter-submit'
);
$filterForm->setMethod( 'get' );
// Note that submit button is hidden for users with JS
enabled in
// as changing the dropdown menu's option updates the
page for them
diff --git a/includes/specials/pagers/NewsletterTablePager.php
b/includes/specials/pagers/NewsletterTablePager.php
index 44a9aa9..f704b92 100644
--- a/includes/specials/pagers/NewsletterTablePager.php
+++ b/includes/specials/pagers/NewsletterTablePager.php
@@ -20,7 +20,7 @@
*/
private $option;
- public function __construct( IContextSource $context = null, IDatabase
$readDb = null ) {
+ public function __construct( IContextSource $context = null, Database
$readDb = null ) {
if ( $readDb !== null ) {
$this->mDb = $readDb;
}
--
To view, visit https://gerrit.wikimedia.org/r/329715
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1e8cb528b1edd94deb41d973982f63ce7ec8c2ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: MtDu <justin.d...@gmail.com>
Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
