jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/361636 )
Change subject: Add basic tracking for successfully resolved conflicts
......................................................................
Add basic tracking for successfully resolved conflicts
Bug: T167862
Change-Id: I8340ba8f56a05fff343d0bef3d5062f85d196cc8
---
M extension.json
M includes/TwoColConflictHooks.php
M includes/TwoColConflictPage.php
3 files changed, 22 insertions(+), 1 deletion(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 89e4ab6..5c4df39 100644
--- a/extension.json
+++ b/extension.json
@@ -31,6 +31,9 @@
"CustomEditor": [
"TwoColConflictHooks::onCustomEditor"
],
+ "EditPage::attemptSave:after": [
+ "TwoColConflictHooks::onAttemptSaveAfter"
+ ],
"ResourceLoaderTestModules": [
"TwoColConflictHooks::onResourceLoaderTestModules"
]
diff --git a/includes/TwoColConflictHooks.php b/includes/TwoColConflictHooks.php
index 4f64a80..2c28007 100644
--- a/includes/TwoColConflictHooks.php
+++ b/includes/TwoColConflictHooks.php
@@ -38,6 +38,23 @@
}
/**
+ * @param EditPage $editPage
+ * @param Status $status
+ */
+ public static function onAttemptSaveAfter( EditPage $editPage, Status
$status ) {
+ global $wgRequest;
+
+ if ( !$wgRequest->getBool( 'mw-twocolconflict-submit' ) ) {
+ return;
+ }
+
+ if ( $status->value == EditPage::AS_SUCCESS_UPDATE ) {
+ $stats =
MediaWikiServices::getInstance()->getStatsdDataFactory();
+ $stats->increment( 'TwoColConflict.conflict.resolved' );
+ }
+ }
+
+ /**
* @param User $user
* @param array[] &$prefs
*/
diff --git a/includes/TwoColConflictPage.php b/includes/TwoColConflictPage.php
index 12cf346..3cda767 100644
--- a/includes/TwoColConflictPage.php
+++ b/includes/TwoColConflictPage.php
@@ -82,7 +82,8 @@
* @return string
*/
private function addEditFormBeforeContent() {
- $out = $this->buildConflictPageChangesCol();
+ $out = HTML::input( 'mw-twocolconflict-submit', 'true',
'hidden' );
+ $out .= $this->buildConflictPageChangesCol();
$editorClass = '';
if ( $this->wikiEditorIsEnabled() ) {
--
To view, visit https://gerrit.wikimedia.org/r/361636
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8340ba8f56a05fff343d0bef3d5062f85d196cc8
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Andrew-WMDE <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: WMDE-Fisch <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
