Don't warn about conflicts when reverting Phriction documents
ClosedPublic
Actions

Authored by epriestley on May 21 2014, 9:48 PM.

Details

Reviewers

btrahan
chad

Maniphest Tasks

T5144: Edit Conflict easily triggered when reverting document

Commits

Restricted Diffusion Commit
rP3c8d88deb454: Don't warn about conflicts when reverting Phriction documents

Summary

Fixes T5144. This was incorrectly checking the content version, not the head version, so reverts would raise the "conflict" warning.

Also fix a couple of FontAwesome icons.

Test Plan

Edited a document.
Reverted a document.
Opened two edit tabs. Edited one, tried to edit #2, got a warning.
Opened two revert tabs. Reverted in one, tried to revert in #2, got a warning.

Diff Detail

Repository

rP Phabricator

Lint

Lint Skipped

Unit

Tests Skipped

Event Timeline

epriestley updated this revision to Diff 21964.May 21 2014, 9:48 PM

epriestley retitled this revision from to Don't warn about conflicts when reverting Phriction documents.

epriestley updated this object.

epriestley edited the test plan for this revision. (Show Details)

epriestley added reviewers: btrahan, chad.

epriestley added a task: T5144: Edit Conflict easily triggered when reverting document.

Herald added a subscriber: epriestley. · View Herald TranscriptMay 21 2014, 9:48 PM

Harbormaster completed remote builds in B643: Diff 21964.May 21 2014, 9:49 PM

chad accepted this revision.May 21 2014, 10:58 PM

chad edited edge metadata.

This revision is now accepted and ready to land.May 21 2014, 10:58 PM

Closed by commit rP3c8d88deb454 (authored by @epriestley).

Revision Contents
Changeset List

Path

Size

src/

applications/

phriction/

controller/

PhrictionEditController.php

10 lines

PhrictionHistoryController.php

10 lines

Diff 21965

View Options

src/applications/phriction/controller/PhrictionEditController.php