revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-15 18:10:53 +01:00
Code Issues Releases Wiki Activity

(stable) Fix file attach bug in Macro

Browse source 
Summary: This was mis-tested by only using one account, which could always see the image. External transaction moved file attachment to the modular transaction for file and audio instead.

Test Plan: Test adding audio and a macro on a pleb account, visit with normal account and see macro fine.

Reviewers: epriestley, amckinley

Reviewed By: amckinley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D17836
This commit is contained in:
Chad Little 2017-05-05 19:50:05 -07:00 committed by epriestley
parent ebb64ca3c9
commit 22c3e49b51
4 changed files with 57 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/applications/macro/editor/PhabricatorMacroEditEngine.php
View file

@ -6,7 +6,7 @@ final class PhabricatorMacroEditEngine
const ENGINECONST = 'macro.image';
public function getEngineName() {
return pht('Macro Imagea');
return pht('Macro Image');
}
public function getSummaryHeader() {

38
src/applications/macro/editor/PhabricatorMacroEditor.php
View file

@ -19,44 +19,6 @@ final class PhabricatorMacroEditor
return pht('%s created %s.', $author, $object);
}
protected function applyCustomExternalTransaction(
PhabricatorLiskDAO $object,
PhabricatorApplicationTransaction $xaction) {
switch ($xaction->getTransactionType()) {
case PhabricatorMacroFileTransaction::TRANSACTIONTYPE:
case PhabricatorMacroAudioTransaction::TRANSACTIONTYPE:
// When changing a macro's image or audio, attach the underlying files
// to the macro (and detach the old files).
$old = $xaction->getOldValue();
$new = $xaction->getNewValue();
$all = array();
if ($old) {
$all[] = $old;
}
if ($new) {
$all[] = $new;
}
$files = id(new PhabricatorFileQuery())
->setViewer($this->requireActor())
->withPHIDs($all)
->execute();
$files = mpull($files, null, 'getPHID');
$old_file = idx($files, $old);
if ($old_file) {
$old_file->detachFromObject($object->getPHID());
}
$new_file = idx($files, $new);
if ($new_file) {
$new_file->attachToObject($object->getPHID());
}
break;
}
}
protected function shouldSendMail(
PhabricatorLiskDAO $object,
array $xactions) {

28
src/applications/macro/xaction/PhabricatorMacroAudioTransaction.php
View file

@ -13,6 +13,34 @@ final class PhabricatorMacroAudioTransaction
$object->setAudioPHID($value);
}
public function applyExternalEffects($object, $value) {
$old = $this->generateOldValue($object);
$new = $value;
$all = array();
if ($old) {
$all[] = $old;
}
if ($new) {
$all[] = $new;
}
$files = id(new PhabricatorFileQuery())
->setViewer($this->getActor())
->withPHIDs($all)
->execute();
$files = mpull($files, null, 'getPHID');
$old_file = idx($files, $old);
if ($old_file) {
$old_file->detachFromObject($object->getPHID());
}
$new_file = idx($files, $new);
if ($new_file) {
$new_file->attachToObject($object->getPHID());
}
}
public function getTitle() {
$new = $this->getNewValue();
$old = $this->getOldValue();

28
src/applications/macro/xaction/PhabricatorMacroFileTransaction.php
View file

@ -13,6 +13,34 @@ final class PhabricatorMacroFileTransaction
$object->setFilePHID($value);
}
public function applyExternalEffects($object, $value) {
$old = $this->generateOldValue($object);
$new = $value;
$all = array();
if ($old) {
$all[] = $old;
}
if ($new) {
$all[] = $new;
}
$files = id(new PhabricatorFileQuery())
->setViewer($this->getActor())
->withPHIDs($all)
->execute();
$files = mpull($files, null, 'getPHID');
$old_file = idx($files, $old);
if ($old_file) {
$old_file->detachFromObject($object->getPHID());
}
$new_file = idx($files, $new);
if ($new_file) {
$new_file->attachToObject($object->getPHID());
}
}
public function getTitle() {
return pht(
'%s changed the image for this macro.',