Page MenuHomePhabricator
Files F15434136

D9167.id21775.diff
No OneTemporary
Actions

D9167.id21775.diff
View Options

diff --git a/src/applications/phriction/controller/PhrictionEditController.php b/src/applications/phriction/controller/PhrictionEditController.php
--- a/src/applications/phriction/controller/PhrictionEditController.php
+++ b/src/applications/phriction/controller/PhrictionEditController.php
@@ -93,6 +93,36 @@
$errors = array();
if ($request->isFormPost()) {
+
+ $overwrite = $request->getBool('overwrite');
+ if (!$overwrite) {
+ $edit_version = $request->getStr('contentVersion');
+ $current_version = $content->getVersion();
+ if ($edit_version != $current_version) {
+ $dialog = $this->newDialog()
+ ->setTitle(pht('Edit Conflict!'))
+ ->appendParagraph(
+ pht(
+ 'Another user made changes to this document after you began '.
+ 'editing it. Do you want to overwrite their changes?'))
+ ->appendParagraph(
+ pht(
+ 'If you choose to overwrite their changes, you should review '.
+ 'the document edit history to see what you overwrote, and '.
+ 'then make another edit to merge the changes if necessary.'))
+ ->addSubmitButton(pht('Overwrite Changes'))
+ ->addCancelButton($request->getRequestURI());
+
+ $dialog->addHiddenInput('overwrite', 'true');
+ foreach ($request->getPassthroughRequestData() as $key => $value) {
+ $dialog->addHiddenInput($key, $value);
+ }
+
+ return $dialog;
+ }
+ }
+
+
$title = $request->getStr('title');
$notes = $request->getStr('description');
@@ -192,6 +222,7 @@
->setAction($request->getRequestURI()->getPath())
->addHiddenInput('slug', $document->getSlug())
->addHiddenInput('nodraft', $request->getBool('nodraft'))
+ ->addHiddenInput('contentVersion', $content->getVersion())
->appendChild(
id(new AphrontFormTextControl())
->setLabel(pht('Title'))

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 26, 2:09 AM (1 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7708426
Default Alt Text
D9167.id21775.diff (1 KB)

Event Timeline

Phabricator · Built by Phacility