Glaisher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/288598
Change subject: Add summary to announce log entry
......................................................................
Add summary to announce log entry
Currently only shown on notification but this should be public
and users can find this from the logs even after a long time.
Change-Id: If304bd8d56dc4e4593fce4866155f26777154981
---
M includes/NewsletterStore.php
M includes/logging/NewsletterLogger.php
M includes/specials/SpecialNewsletter.php
3 files changed, 9 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter
refs/changes/98/288598/1
diff --git a/includes/NewsletterStore.php b/includes/NewsletterStore.php
index 7cf83c4..d0c4c41 100644
--- a/includes/NewsletterStore.php
+++ b/includes/NewsletterStore.php
@@ -224,13 +224,14 @@
* @param Newsletter $newsletter
* @param Title $title
* @param User $publisher
+ * @param string $summary
*
* @return bool
*/
- public function addNewsletterIssue( Newsletter $newsletter, Title
$title, User $publisher ) {
+ public function addNewsletterIssue( Newsletter $newsletter, Title
$title, User $publisher, $summary ) {
$success = $this->db->addNewsletterIssue( $newsletter, $title,
$publisher );
if ( $success ) {
- $this->logger->logNewIssue( $publisher, $newsletter,
$success );
+ $this->logger->logNewIssue( $publisher, $newsletter,
$success, $summary );
}
return (bool)$success;
}
diff --git a/includes/logging/NewsletterLogger.php
b/includes/logging/NewsletterLogger.php
index bbf309b..5a385d8 100644
--- a/includes/logging/NewsletterLogger.php
+++ b/includes/logging/NewsletterLogger.php
@@ -52,7 +52,7 @@
$log->publish( $log->insert() );
}
- public function logNewIssue( User $publisher, Newsletter $newsletter,
$issueId ) {
+ public function logNewIssue( User $publisher, Newsletter $newsletter,
$issueId, $comment ) {
$log = new ManualLogEntry( 'newsletter', 'issue-added' );
$log->setPerformer( $publisher );
$log->setTarget( SpecialPage::getTitleFor( 'Newsletter',
$newsletter->getId() ) );
@@ -60,6 +60,7 @@
'4:newsletter-link:nl_id' =>
"{$newsletter->getId()}:{$newsletter->getName()}",
'5::nli_issue_id' => $issueId
] );
+ $log->setComment( $comment );
$log->setRelations( [ 'nl_id' => $newsletter->getId() ] );
$log->publish( $log->insert() );
}
diff --git a/includes/specials/SpecialNewsletter.php
b/includes/specials/SpecialNewsletter.php
index 03ae48d..3ad58e6 100644
--- a/includes/specials/SpecialNewsletter.php
+++ b/includes/specials/SpecialNewsletter.php
@@ -546,9 +546,11 @@
throw new ThrottledError;
}
+ $summary = trim( $data['summary'] );
+
// Everything seems okay. Let's try to do it for real now.
$store = NewsletterStore::getDefaultInstance();
- $success = $store->addNewsletterIssue( $this->newsletter,
$title, $user );
+ $success = $store->addNewsletterIssue( $this->newsletter,
$title, $user, $summary );
if ( !$success ) {
// DB insert failed. :( so don't create an Echo event
and stop from here
@@ -562,7 +564,7 @@
'extra' => array(
'newsletter-name' =>
$this->newsletter->getName(),
'newsletter-id' =>
$this->newsletter->getId(),
- 'section-text' => trim(
$data['summary'] ),
+ 'section-text' => $summary,
'notifyAgent' => true,
),
'agent' => $user,
--
To view, visit https://gerrit.wikimedia.org/r/288598
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If304bd8d56dc4e4593fce4866155f26777154981
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Glaisher <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
