Page MenuHomePhabricator
Files F13189516

D19913.diff
No OneTemporary
Actions

D19913.diff
View Options

diff --git a/resources/sql/autopatches/20181218.pholio.01.imageauthor.sql b/resources/sql/autopatches/20181218.pholio.01.imageauthor.sql
new file mode 100644
--- /dev/null
+++ b/resources/sql/autopatches/20181218.pholio.01.imageauthor.sql
@@ -0,0 +1,2 @@
+ALTER TABLE {$NAMESPACE}_pholio.pholio_image
+ ADD authorPHID VARBINARY(64) NOT NULL;
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -10947,6 +10947,7 @@
'PholioImage' => array(
'PholioDAO',
'PhabricatorPolicyInterface',
+ 'PhabricatorExtendedPolicyInterface',
),
'PholioImageDescriptionTransaction' => 'PholioImageTransactionType',
'PholioImageFileTransaction' => 'PholioImageTransactionType',
diff --git a/src/applications/pholio/controller/PholioImageUploadController.php b/src/applications/pholio/controller/PholioImageUploadController.php
--- a/src/applications/pholio/controller/PholioImageUploadController.php
+++ b/src/applications/pholio/controller/PholioImageUploadController.php
@@ -23,6 +23,7 @@
}
$image = PholioImage::initializeNewImage()
+ ->setAuthorPHID($viewer->getPHID())
->attachFile($file)
->setName($title)
->setDescription($description)
diff --git a/src/applications/pholio/controller/PholioMockEditController.php b/src/applications/pholio/controller/PholioMockEditController.php
--- a/src/applications/pholio/controller/PholioMockEditController.php
+++ b/src/applications/pholio/controller/PholioMockEditController.php
@@ -141,6 +141,7 @@
if ($replaces_image_phid) {
$replace_image = PholioImage::initializeNewImage()
+ ->setAuthorPHID($viewer->getPHID())
->setReplacesImagePHID($replaces_image_phid)
->setFilePhid($file_phid)
->attachFile($file)
@@ -154,6 +155,7 @@
$posted_mock_images[] = $replace_image;
} else if (!$existing_image) { // this is an add
$add_image = PholioImage::initializeNewImage()
+ ->setAuthorPHID($viewer->getPHID())
->setFilePhid($file_phid)
->attachFile($file)
->setName(strlen($title) ? $title : $file->getName())
diff --git a/src/applications/pholio/controller/PholioMockViewController.php b/src/applications/pholio/controller/PholioMockViewController.php
--- a/src/applications/pholio/controller/PholioMockViewController.php
+++ b/src/applications/pholio/controller/PholioMockViewController.php
@@ -82,7 +82,7 @@
$add_comment = $this->buildAddCommentView($mock, $comment_form_id);
$crumbs = $this->buildApplicationCrumbs();
- $crumbs->addTextCrumb('M'.$mock->getID(), '/M'.$mock->getID());
+ $crumbs->addTextCrumb($mock->getMonogram(), $mock->getURI());
$crumbs->setBorder(true);
$thumb_grid = id(new PholioMockThumbGridView())
@@ -92,16 +92,17 @@
$view = id(new PHUITwoColumnView())
->setHeader($header)
->setCurtain($curtain)
- ->setMainColumn(array(
- $output,
- $thumb_grid,
- $details,
- $timeline,
- $add_comment,
- ));
+ ->setMainColumn(
+ array(
+ $output,
+ $thumb_grid,
+ $details,
+ $timeline,
+ $add_comment,
+ ));
return $this->newPage()
- ->setTitle('M'.$mock->getID().' '.$title)
+ ->setTitle(pht('%s %s', $mock->getMonogram(), $title))
->setCrumbs($crumbs)
->setPageObjectPHIDs(array($mock->getPHID()))
->addQuicksandConfig(
diff --git a/src/applications/pholio/lipsum/PhabricatorPholioMockTestDataGenerator.php b/src/applications/pholio/lipsum/PhabricatorPholioMockTestDataGenerator.php
--- a/src/applications/pholio/lipsum/PhabricatorPholioMockTestDataGenerator.php
+++ b/src/applications/pholio/lipsum/PhabricatorPholioMockTestDataGenerator.php
@@ -42,6 +42,7 @@
$images = array();
foreach ($files as $file) {
$image = PholioImage::initializeNewImage()
+ ->setAuthorPHID($author_phid)
->setFilePHID($file->getPHID())
->setSequence($sequence++)
->attachMock($mock);
diff --git a/src/applications/pholio/storage/PholioImage.php b/src/applications/pholio/storage/PholioImage.php
--- a/src/applications/pholio/storage/PholioImage.php
+++ b/src/applications/pholio/storage/PholioImage.php
@@ -2,8 +2,10 @@
final class PholioImage extends PholioDAO
implements
- PhabricatorPolicyInterface {
+ PhabricatorPolicyInterface,
+ PhabricatorExtendedPolicyInterface {
+ protected $authorPHID;
protected $mockID;
protected $filePHID;
protected $name;
@@ -57,8 +59,7 @@
}
public function getFile() {
- $this->assertAttached($this->file);
- return $this->file;
+ return $this->assertAttached($this->file);
}
public function attachMock(PholioMock $mock) {
@@ -67,8 +68,7 @@
}
public function getMock() {
- $this->assertAttached($this->mock);
- return $this->mock;
+ return $this->assertAttached($this->mock);
}
public function attachInlineComments(array $inline_comments) {
@@ -83,20 +83,46 @@
}
-/* -( PhabricatorPolicyInterface Implementation )-------------------------- */
+/* -( PhabricatorPolicyInterface )----------------------------------------- */
public function getCapabilities() {
- return $this->getMock()->getCapabilities();
+ return array(
+ PhabricatorPolicyCapability::CAN_VIEW,
+ PhabricatorPolicyCapability::CAN_EDIT,
+ );
}
public function getPolicy($capability) {
- return $this->getMock()->getPolicy($capability);
+ // If the image is attached to a mock, we use an extended policy to match
+ // the mock's permissions.
+ if ($this->getMockID()) {
+ return PhabricatorPolicies::getMostOpenPolicy();
+ }
+
+ // If the image is not attached to a mock, only the author can see it.
+ return $this->getAuthorPHID();
}
- // really the *mock* controls who can see an image
public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
- return $this->getMock()->hasAutomaticCapability($capability, $viewer);
+ return false;
+ }
+
+
+/* -( PhabricatorExtendedPolicyInterface )--------------------------------- */
+
+
+ public function getExtendedPolicy($capability, PhabricatorUser $viewer) {
+ if ($this->getMockID()) {
+ return array(
+ array(
+ $this->getMock(),
+ $capability,
+ ),
+ );
+ }
+
+ return array();
}
}

File Metadata

Mime Type
text/plain
Expires
May 12 2024, 6:08 AM (5 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6286970
Default Alt Text
D19913.diff (6 KB)

Event Timeline

Phabricator · Built by Phacility