Page MenuHomePhabricator
Create Task
Maniphest T198213

Save version consisting of selected lines
Closed, ResolvedPublic13 Story Points
Actions

Description

  • Compose selected lines and save as resolved conflict
  • Add an edit summary line that contains the previously entered message (before the conflict occured)
  • Add a cancel option that leads you to the current version of the page
  • This is all non-js

Mock
Look at No. 8 of the mock (and resolve the mystery by clicking on it)


Notes

  • Most likely we will have an action triggering us at the edit page. At this point we will compose the content, and then return it to the usual edit process

Related Objects
Search...

Event Timeline

Lea_WMDE created this task.Jun 26 2018, 1:38 PM
Lea_WMDE triaged this task as Normal priority.
WMDE-Fisch moved this task from Sprint Backlog to Doing on the WMDE-QWERTY-Sprint-2018-07-31 board.Jul 31 2018, 3:36 PM
WMDE-Fisch claimed this task.
gerritbot added a subscriber: gerritbot.Aug 6 2018, 4:10 PM

Change 450606 had a related patch set uploaded (by WMDE-Fisch; owner: WMDE-Fisch):
[mediawiki/extensions/TwoColConflict@master] Save the currently selected version of the diff

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

gerritbot added a comment.Aug 13 2018, 2:01 PM

Change 452368 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] Clean-ups to SplitTwoColConflict code and tests

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

gerritbot added a comment.Aug 13 2018, 3:00 PM

Change 450606 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Save the currently selected version of the diff

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

JStrodt_WMDE added a comment.Aug 14 2018, 1:14 PM

Demoed. It works, but not in the simulation. @WMDE-Fisch: Please make a new task for that.

JStrodt_WMDE closed this task as Resolved.Aug 14 2018, 1:16 PM
JStrodt_WMDE updated the task description. (Show Details)
JStrodt_WMDE moved this task from Demo to Done on the WMDE-QWERTY-Sprint-2018-07-31 board.
gerritbot added a comment.Aug 16 2018, 9:06 AM

Change 452368 merged by WMDE-Fisch:
[mediawiki/extensions/TwoColConflict@master] Clean-ups to SplitTwoColConflict code and tests

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

Content licensed under Creative Commons Attribution-ShareAlike 3.0 (CC-BY-SA) unless otherwise noted; code licensed under GNU General Public License (GPL) or 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