Page MenuHomePhabricator
Create Task
Maniphest T207148

"Reset changes?" Text should only appear if something was changed
Closed, ResolvedPublic5 Estimated Story Points
Actions

Description

In TwoColConflict go to the editmode of some selected paragraph, and without changing anything click the Cancle/Reset-Icon.
You will be promted with the Text "Änderungen verwerfen? Dein Text wird auf den Zeitpunkt zurückgesetzt, an dem der Bearbeitungskonflikt aufgetreten ist."

Since you did not change anything, the text is confusing and unnecessary. Analogously to the normal editor you should only get a warning if you did change anything.

Details

ProjectBranchLines +/-Subject
mediawiki/extensions/TwoColConflictmaster+11 -20Avoid duplicate jQuery selectors on reset
mediawiki/extensions/TwoColConflictmaster+27 -0Only ask to reset changes if there are any
Customize query in gerrit

Event Timeline

MichaelSchoenitzer_WMDE created this task.Oct 16 2018, 11:42 AM
Restricted Application added a project: archived--TCB-Team. · View Herald TranscriptOct 16 2018, 11:42 AM
Restricted Application added a subscriber: Aklapper. · View Herald Transcript
Hanna_Petruschat_WMDE updated the task description. (Show Details)Feb 4 2020, 10:27 AM
Lena_WMDE moved this task from Backlog to Before full default on the Two-Column-Edit-Conflict-Merge board.Feb 6 2020, 9:47 AM
WMDE-Fisch set the point value for this task to 5.Feb 10 2020, 11:02 AM
WMDE-Fisch claimed this task.Feb 10 2020, 11:19 AM
WMDE-Fisch added a project: WMDE-QWERTY-Sprint-2020-02-04.
WMDE-Fisch moved this task from Before full default to Tickets in sprint on the Two-Column-Edit-Conflict-Merge board.
WMDE-Fisch moved this task from Sprint Backlog to Doing on the WMDE-QWERTY-Sprint-2020-02-04 board.
gerritbot added a comment.Feb 12 2020, 10:59 AM

Change 571694 had a related patch set uploaded (by WMDE-Fisch; owner: WMDE-Fisch):
[mediawiki/extensions/TwoColConflict@master] Only ask to reset changes if there are any

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

gerritbot added a project: Patch-For-Review.Feb 12 2020, 10:59 AM
WMDE-Fisch moved this task from Doing to Review on the WMDE-QWERTY-Sprint-2020-02-04 board.Feb 12 2020, 11:02 AM
thiemowmde moved this task from Review to Doing on the WMDE-QWERTY-Sprint-2020-02-04 board.Feb 17 2020, 1:20 PM
gerritbot added a comment.Feb 18 2020, 12:19 PM

Change 572849 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] Avoid duplicate jQuery selectors on reset

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

gerritbot added a comment.Feb 18 2020, 12:33 PM

Change 571694 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Only ask to reset changes if there are any

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

WMDE-Fisch closed this task as Resolved.Feb 18 2020, 12:58 PM
WMDE-Fisch moved this task from Doing to Demo on the WMDE-QWERTY-Sprint-2020-02-04 board.
WMDE-Fisch moved this task from Demo to Done on the WMDE-QWERTY-Sprint-2020-02-04 board.
ReleaseTaggerBot added a project: MW-1.35-notes (1.35.0-wmf.20; 2020-02-18).Feb 18 2020, 1:01 PM
gerritbot added a comment.Feb 19 2020, 8:38 AM

Change 572849 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Avoid duplicate jQuery selectors on reset

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

ReleaseTaggerBot edited projects, added MW-1.35-notes (1.35.0-wmf.21; 2020-02-25); removed MW-1.35-notes (1.35.0-wmf.20; 2020-02-18).Feb 19 2020, 9:00 AM
Maintenance_bot removed a project: Patch-For-Review.Feb 19 2020, 9:11 AM
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