Page MenuHomePhabricator
Create Task
Maniphest T225617

Add the nowcommons template to the source wiki if requested
Closed, ResolvedPublic8 Estimated Story Points
Actions

Assigned To
Andrew-WMDE
Authored By
• Lea_WMDE
Jun 12 2019, 11:45 AM
Tags
Referenced Files
F30463451: image.png
Sep 25 2019, 12:05 PM
F29604379: Bildschirmfoto 2019-06-19 um 08.56.02.png
Jun 19 2019, 6:59 AM
Subscribers
awight
• Jan_Dittrich
JStrodt_WMDE
• Lea_WMDE
Liuxinyu970226
Pikne
WMDE-Fisch

Description

Mock

Bildschirmfoto 2019-06-19 um 08.56.02.png (532×1 px, 60 KB)

Texts

You can declare on the source wiki that this file has been imported to <target wiki>. This is done by adding a {{<template name>}} template to the original file page in your name.

  • mark source wiki file as imported to <target wiki>

Acceptance Criteria

  • Add a new section on the preview page as shown in the mock, which allows people to decide whether or not they want to inform the source wiki about the file move.
  • By default, the checkbox is set to “do the automated edit”
  • If the field is clicked and the transfer was successful, the edit is done automatically
  • The edit should be made in the name of the moving user, with the edit summary “This file is now on Wikimedia Commons (moved with FileImporter).”
  • This ticket does not include an changes to the success message handling.

Details

SubjectRepoBranchLines +/-
Actually check if source editing is allowedmediawiki/extensions/FileImportermaster+93 -22
Expose less implementation details in RemoteApiActionExecutormediawiki/extensions/FileImportermaster+45 -35
Make use of wfAppendQuery() in RemoteApiRequestExecutormediawiki/extensions/FileImportermaster+19 -9
Enable FileImporter source wiki edit and deleteoperations/mediawiki-configmaster+2 -2
Fix bug involving file renaming and centralauth cleanup/deletemediawiki/extensions/FileImporterwmf/1.34.0-wmf.13+43 -7
Fix bug involving file renaming and centralauth cleanup/deletemediawiki/extensions/FileImportermaster+43 -7
Remove misplaced commamediawiki/extensions/FileImportermaster+1 -1
Option to edit source wiki should be enabled by defaultmediawiki/extensions/FileImportermaster+40 -1
Include a newline with the template, so it always appears on its own line.mediawiki/extensions/FileImportermaster+2 -2
Enable experimental FileImporter features on labsoperations/mediawiki-configmaster+3 -0
Assert status after post-import editmediawiki/extensions/FileImportermaster+39 -14
Tests for source wiki editingmediawiki/extensions/FileImportermaster+399 -3
Allow automatic adding of the NowCommons template to the source wikimediawiki/extensions/FileImportermaster+589 -7
Post import handler does our success liftingmediawiki/extensions/FileImportermaster+273 -37
Add CentralAuth to FileImporter required extensionsintegration/configmaster+1 -1
[WIP] UI elements to confirm source wiki editsmediawiki/extensions/FileImportermaster+80 -1
Show related patches Customize query in gerrit

Related Objects
Search...

Event Timeline

There are a very large number of changes, so older changes are hidden. Show Older Changes
WMDE-Fisch mentioned this in rEFLIbb0238e06fd1: [WIP] Post import handler does our success lifting.Jun 28 2019, 8:06 AM
WMDE-Fisch mentioned this in rEFLI7d73dfd6ef70: Post import handler does our success lifting.Jun 28 2019, 9:22 AM
WMDE-Fisch mentioned this in rEFLI80ea4e2bfebc: [WIP] Set notice in file on the source wiki.Jun 28 2019, 9:32 AM
gerritbot added a comment.Jun 28 2019, 9:52 AM

Change 519415 merged by jenkins-bot:
[mediawiki/extensions/FileImporter@master] Post import handler does our success lifting

https://gerrit.wikimedia.org/r/519415

ReleaseTaggerBot added a project: MW-1.34-notes (1.34.0-wmf.13; 2019-07-09).Jun 28 2019, 10:00 AM
WMDE-Fisch mentioned this in rEFLI713396c66380: [WIP] Set notice in file on the source wiki.Jun 28 2019, 10:23 AM
WMDE-Fisch added a comment.Jun 28 2019, 11:59 AM

@JStrodt_WMDE @Lea_WMDE
What text should be presented to the user on a successful import with a successful source wiki template-addition?

JStrodt_WMDE updated the task description. (Show Details)Jun 28 2019, 12:23 PM
JStrodt_WMDE added a comment.Jun 28 2019, 12:25 PM

@WMDE-Fisch As I understand it, that's included in T226075. @Lea_WMDE Correct?

WMDE-Fisch mentioned this in rEFLI3cbafb92a361: [WIP] Set notice in file on the source wiki.Jun 28 2019, 12:36 PM
WMDE-Fisch added a comment.Jun 28 2019, 1:47 PM
In T225617#5292129, @JStrodt_WMDE wrote:

@WMDE-Fisch As I understand it, that's included in T226075. @Lea_WMDE Correct?

Ah yeah, sorry I kind of overlooked that. Using The file has been successfully imported to <target wiki name>. from T226075 now.

WMDE-Fisch mentioned this in rEFLI5e93dd5303a7: [WIP] Set notice in file on the source wiki.Jun 28 2019, 2:00 PM
WMDE-Fisch mentioned this in rEFLIb9f65ad1cedd: [WIP] Set notice in file on the source wiki.Jul 1 2019, 9:29 AM
WMDE-Fisch added a comment.Jul 1 2019, 10:22 AM

So last message I'm missing:

For the case, that the user wants the auto source edit, but for some reason the auto source edit fails, I would then show this message
The import was successful. To declare that the file is now on <target wiki name>, please return to [[the original file]] and add this template: {{<template name>}}.
but would also want to show a warning, that the auto edit failed. Something along the lines of
Editing the source wiki automatically was not possible please follow the instructions above.

( the "warning" about the failed source wiki edit will be shown underneath the success message )

@JStrodt_WMDE

WMDE-Fisch mentioned this in rEFLIf10f3a6d3c03: Allow automatic adding of the NowCommons template to the source wiki.Jul 1 2019, 11:00 AM
JStrodt_WMDE added a comment.Jul 1 2019, 12:51 PM

@WMDE-Fisch: I would prefer the error message to appear before describing the next step. How about this?

The import was successful, but the template {{<template name>}} could not be added automatically on the source wiki. Please return to [[the original file]] and manually add {{<template name>}} to declare that the file is now on <target wiki name>.

Question: Can we give more specifics about why the source wiki couldn't be edited automatically?

Andrew-WMDE mentioned this in rEFLI02c708722499: Allow automatic adding of the NowCommons template to the source wiki.Jul 1 2019, 3:33 PM
• Lea_WMDE added a comment.Jul 2 2019, 7:43 AM

Question: Can we give more specifics about why the source wiki couldn't be edited automatically?

If that is not a 5 minute task, but we could theoretically do it, could you please create another ticket for it?
Thanks :)

awight subscribed.Jul 2 2019, 8:16 AM
In T225617#5299116, @Lea_WMDE wrote:

Question: Can we give more specifics about why the source wiki couldn't be edited automatically?

If that is not a 5 minute task, but we could theoretically do it, could you please create another ticket for it?
Thanks :)

I'll split this into a new ticket, because this task's work is otherwise complete, and we have the same question for T226532.

awight mentioned this in T227064: User notification when an automated source edit or deletion fails.Jul 2 2019, 8:22 AM
WMDE-Fisch mentioned this in rEFLI038f8b09890c: Allow automatic adding of the NowCommons template to the source wiki.Jul 2 2019, 10:32 AM
gerritbot added a comment.Jul 2 2019, 11:36 AM

Change 386205 merged by jenkins-bot:
[mediawiki/extensions/FileImporter@master] Allow automatic adding of the NowCommons template to the source wiki

https://gerrit.wikimedia.org/r/386205

Maintenance_bot removed a project: Patch-For-Review.Jul 2 2019, 12:10 PM
gerritbot added a comment.Jul 2 2019, 12:11 PM

Change 519294 had a related patch set uploaded (by Awight; owner: Awight):
[mediawiki/extensions/FileImporter@master] Tests for source wiki editing

https://gerrit.wikimedia.org/r/519294

gerritbot added a project: Patch-For-Review.Jul 2 2019, 12:11 PM

Change 520217 had a related patch set uploaded (by Awight; owner: Awight):
[mediawiki/extensions/FileImporter@master] Assert status after post-import edit

https://gerrit.wikimedia.org/r/520217

awight mentioned this in rEFLI0e2520875b7e: Tests for source wiki editing.Jul 2 2019, 12:13 PM
awight mentioned this in rEFLI56220f23bdc1: Assert status after post-import edit.
WMDE-Fisch moved this task from Doing to Review on the WMDE-QWERTY-Sprint-2019-06-26 board.Jul 2 2019, 12:54 PM
gerritbot added a comment.Jul 2 2019, 1:15 PM

Change 520234 had a related patch set uploaded (by Awight; owner: Awight):
[operations/mediawiki-config@master] Enable experimental FileImporter features on labs

https://gerrit.wikimedia.org/r/520234

WMDE-Fisch mentioned this in rEFLI99604822e03f: Assert status after post-import edit.Jul 2 2019, 1:43 PM
gerritbot added a comment.Jul 2 2019, 1:47 PM

Change 519294 merged by jenkins-bot:
[mediawiki/extensions/FileImporter@master] Tests for source wiki editing

https://gerrit.wikimedia.org/r/519294

gerritbot added a comment.Jul 2 2019, 1:55 PM

Change 520217 merged by jenkins-bot:
[mediawiki/extensions/FileImporter@master] Assert status after post-import edit

https://gerrit.wikimedia.org/r/520217

gerritbot added a comment.Jul 3 2019, 11:04 AM

Change 520234 merged by jenkins-bot:
[operations/mediawiki-config@master] Enable experimental FileImporter features on labs

https://gerrit.wikimedia.org/r/520234

Maintenance_bot removed a project: Patch-For-Review.Jul 3 2019, 11:10 AM
awight added a comment.Jul 3 2019, 1:16 PM

Minor bug report: We should include a newline before the template, here's an example edit:
https://de.wikipedia.beta.wmflabs.org/w/index.php?title=Datei:Green_Test.png&diff=24510&oldid=22444

gerritbot added a comment.Jul 3 2019, 1:22 PM

Change 520438 had a related patch set uploaded (by Awight; owner: Awight):
[mediawiki/extensions/FileImporter@master] Include a newline with the template, so it always appears on its own line.

https://gerrit.wikimedia.org/r/520438

gerritbot added a project: Patch-For-Review.Jul 3 2019, 1:22 PM
awight mentioned this in rEFLId4b64a88c7b6: Include a newline with the template, so it always appears on its own line..Jul 3 2019, 1:24 PM
awight mentioned this in rEFLI5538c2f0ac58: Include a newline with the template, so it always appears on its own line..Jul 3 2019, 1:31 PM
gerritbot added a comment.Jul 3 2019, 1:56 PM

Change 520447 had a related patch set uploaded (by WMDE-Fisch; owner: WMDE-Fisch):
[mediawiki/extensions/FileImporter@master] Option to edit source wiki should be enabled by default

https://gerrit.wikimedia.org/r/520447

WMDE-Fisch mentioned this in rEFLIb4c2f6ac7e64: Option to edit source wiki should be enabled by default.Jul 3 2019, 1:58 PM
gerritbot added a comment.Jul 3 2019, 2:08 PM

Change 520438 merged by jenkins-bot:
[mediawiki/extensions/FileImporter@master] Include a newline with the template, so it always appears on its own line.

https://gerrit.wikimedia.org/r/520438

WMDE-Fisch moved this task from Review to Demo on the WMDE-QWERTY-Sprint-2019-06-26 board.Jul 3 2019, 3:09 PM

This can be tested on beta now

https://commons.wikimedia.beta.wmflabs.org/wiki/Special:ImportFile?clientUrl=https://en.wikipedia.beta.wmflabs.org/wiki/File:Green_Image_Test.png

gerritbot added a comment.Jul 3 2019, 3:42 PM

Change 520447 merged by jenkins-bot:
[mediawiki/extensions/FileImporter@master] Option to edit source wiki should be enabled by default

https://gerrit.wikimedia.org/r/520447

WMDE-Fisch added a comment.Jul 3 2019, 3:57 PM

Another file to test this with
https://commons.wikimedia.beta.wmflabs.org/wiki/Special:ImportFile?clientUrl=https%3A%2F%2Fde.wikipedia.beta.wmflabs.org%2Fwiki%2FDatei%3ACoole_Ziege.jpeg&importSource=FileExporter

Maintenance_bot removed a project: Patch-For-Review.Jul 3 2019, 4:11 PM
• Lea_WMDE added a comment.Jul 5 2019, 6:22 PM

I don't manage to test this before my vacation anymore, my newly created account has too few rights, and my actual one too many :/ Could you please self test this one? Thank you!

Pikne subscribed.Jul 6 2019, 7:21 PM

Tiny note from translator: comma seems to be misplaced in message "Editing, the source wiki automatically was not possible please follow the instructions above."

gerritbot added a comment.Jul 8 2019, 9:06 AM

Change 521227 had a related patch set uploaded (by WMDE-Fisch; owner: WMDE-Fisch):
[mediawiki/extensions/FileImporter@master] Remove misplaced comma

https://gerrit.wikimedia.org/r/521227

gerritbot added a project: Patch-For-Review.Jul 8 2019, 9:06 AM
WMDE-Fisch added a comment.Jul 8 2019, 9:07 AM
In T225617#5311114, @Pikne wrote:

Tiny note from translator: comma seems to be misplaced in message "Editing, the source wiki automatically was not possible please follow the instructions above."

Thanks. I uploaded a fix for it.

gerritbot added a comment.Jul 8 2019, 6:16 PM

Change 521227 merged by jenkins-bot:
[mediawiki/extensions/FileImporter@master] Remove misplaced comma

https://gerrit.wikimedia.org/r/521227

awight mentioned this in rEFLIbddac62d5046: Remove misplaced comma.Jul 8 2019, 6:18 PM
Maintenance_bot removed a project: Patch-For-Review.Jul 8 2019, 7:11 PM
gerritbot added a comment.Jul 11 2019, 10:21 AM

Change 522052 had a related patch set uploaded (by Andrew-WMDE; owner: Andrew-WMDE):
[mediawiki/extensions/FileImporter@master] [WIP] Fix bug involving file renaming and centralauth cleanup/delete

https://gerrit.wikimedia.org/r/522052

gerritbot added a project: Patch-For-Review.Jul 11 2019, 10:21 AM
gerritbot added a comment.Jul 12 2019, 8:07 AM

Change 522052 merged by jenkins-bot:
[mediawiki/extensions/FileImporter@master] Fix bug involving file renaming and centralauth cleanup/delete

https://gerrit.wikimedia.org/r/522052

WMDE-Fisch mentioned this in rEFLI05bd86e1f140: Fix bug involving file renaming and centralauth cleanup/delete.Jul 12 2019, 8:07 AM
Maintenance_bot removed a project: Patch-For-Review.Jul 12 2019, 8:10 AM
gerritbot added a comment.Jul 16 2019, 7:58 AM

Change 523618 had a related patch set uploaded (by Awight; owner: Andrew-WMDE):
[mediawiki/extensions/FileImporter@wmf/1.34.0-wmf.13] Fix bug involving file renaming and centralauth cleanup/delete

https://gerrit.wikimedia.org/r/523618

gerritbot added a project: Patch-For-Review.Jul 16 2019, 7:58 AM
gerritbot added a comment.Jul 16 2019, 8:39 AM

Change 523661 had a related patch set uploaded (by Awight; owner: Awight):
[operations/mediawiki-config@master] Enable FileImporter source wiki edit and delete

https://gerrit.wikimedia.org/r/523661

gerritbot added a comment.Jul 16 2019, 8:41 AM

Change 523618 abandoned by Awight:
Fix bug involving file renaming and centralauth cleanup/delete

https://gerrit.wikimedia.org/r/523618

awight added a comment.Jul 19 2019, 7:55 AM

Planning to enable in production on Monday, July 22nd.

gerritbot added a comment.Jul 22 2019, 11:06 AM

Change 523661 merged by jenkins-bot:
[operations/mediawiki-config@master] Enable FileImporter source wiki edit and delete

https://gerrit.wikimedia.org/r/523661

Stashbot added a comment.Jul 22 2019, 11:13 AM

Mentioned in SAL (#wikimedia-operations) [2019-07-22T11:13:05Z] <awight@deploy1001> Synchronized wmf-config/CommonSettings.php: SWAT: [[gerrit:523661|Enable FileImporter source wiki edit and delete (T225617, T226532)]] (duration: 00m 56s)

Stashbot mentioned this in T226532: If rights exist, suggest automatic deletion of the source wiki file.Jul 22 2019, 11:13 AM

Mentioned in SAL (#wikimedia-operations) [2019-07-22T11:14:36Z] <awight@deploy1001> Synchronized wmf-config/CommonSettings-labs.php: SWAT: [[gerrit:523661|Enable FileImporter source wiki edit and delete, (remove labs customizations) (T225617, T226532)]] (duration: 00m 54s)

awight moved this task from Tickets in sprint to Default version backlog on the Move-Files-To-Commons board.Sep 6 2019, 10:13 AM
awight mentioned this in T225618: Make it possible to automatically delete a moved file on the source wiki if rights exist to do so.Sep 10 2019, 9:19 PM
awight added a comment.Sep 10 2019, 9:24 PM

This ran into blocking bug T228851: Source wiki editing and deletion always fails, but otherwise should be code complete.

awight added a subtask: T228851: Source wiki editing and deletion always fails.Sep 10 2019, 9:24 PM
Maintenance_bot removed a project: Patch-For-Review.Sep 10 2019, 10:10 PM
thiemowmde moved this task from Default version backlog to Tickets in sprint on the Move-Files-To-Commons board.Sep 20 2019, 8:26 AM
thiemowmde mentioned this in T233575: Should it be possible to move files that are protected on the source wiki?.Sep 23 2019, 7:52 AM
thiemowmde closed subtask T228851: Source wiki editing and deletion always fails as Resolved.Sep 23 2019, 8:47 AM
awight added a project: WMDE-QWERTY-Sprint-2019-09-10.Sep 23 2019, 8:55 AM
awight updated the task description. (Show Details)
awight moved this task from Sprint Backlog to Demo on the WMDE-QWERTY-Sprint-2019-09-10 board.
Andrew-WMDE moved this task from Demo to Done on the WMDE-QWERTY-Sprint-2019-09-10 board.Sep 25 2019, 11:28 AM
Andrew-WMDE added a comment.Sep 25 2019, 12:05 PM

Verified by import from test2 to testwiki:

Import preview page on testwiki:

image.png (1×3 px, 573 KB)

Automatic edit on test2 wiki:
https://test2.wikipedia.org/w/index.php?title=File:038pro01.jpg&oldid=409672

Destination file on testwiki:
https://test.wikipedia.org/w/index.php?title=File:038pro01.jpg&oldid=402873

awight closed this task as Resolved.Sep 25 2019, 12:59 PM
gerritbot added a comment.May 27 2020, 9:26 AM

Change 598981 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/FileImporter@master] Actually check if source editing is allowed

https://gerrit.wikimedia.org/r/598981

gerritbot added a project: Patch-For-Review.May 27 2020, 9:26 AM
gerritbot added a comment.May 27 2020, 1:57 PM

Change 599033 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/FileImporter@master] Make use of wfAppendQuery() in RemoteApiRequestExecutor

https://gerrit.wikimedia.org/r/599033

gerritbot added a comment.May 27 2020, 2:33 PM

Change 599046 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/FileImporter@master] Expose less implementation details in RemoteApiActionExecutor

https://gerrit.wikimedia.org/r/599046

gerritbot added a comment.May 29 2020, 1:56 PM

Change 599033 merged by jenkins-bot:
[mediawiki/extensions/FileImporter@master] Make use of wfAppendQuery() in RemoteApiRequestExecutor

https://gerrit.wikimedia.org/r/599033

thiemowmde mentioned this in rEFLIe82992b4deee: Make use of wfAppendQuery() in RemoteApiRequestExecutor.May 29 2020, 1:58 PM
gerritbot added a comment.May 29 2020, 2:03 PM

Change 599046 merged by jenkins-bot:
[mediawiki/extensions/FileImporter@master] Expose less implementation details in RemoteApiActionExecutor

https://gerrit.wikimedia.org/r/599046

thiemowmde mentioned this in rEFLI831b8db30fcc: Expose less implementation details in RemoteApiActionExecutor.May 29 2020, 2:04 PM
ReleaseTaggerBot added a project: MW-1.35-notes (1.35.0-wmf.35; 2020-06-02).May 30 2020, 8:03 AM
gerritbot added a comment.Jun 2 2020, 1:39 PM

Change 598981 merged by jenkins-bot:
[mediawiki/extensions/FileImporter@master] Actually check if source editing is allowed

https://gerrit.wikimedia.org/r/598981

thiemowmde mentioned this in rEFLIefc72c31bb93: Actually check if source editing is allowed.Jun 2 2020, 1:41 PM
Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL · Credits