@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Fix two issues with Remarkup in Pholio
Summary:
Fixes T10865.
- Mock descriptions did not markup.
- Image descriptions did not get a proper container `<div />`.
Test Plan:
- Created a mock with remarkup in the mock description and in an image description.
- Viewed mock detail.
- Saw list styles render properly in both mock description and image description.
Reviewers: chad
Reviewed By: chad
Maniphest Tasks: T10865
Differential Revision: https://secure.phabricator.com/D15793
+14
-3
+3
-2
src/applications/pholio/controller/PholioMockViewController.php
+3
-2
src/applications/pholio/controller/PholioMockViewController.php
···
173
173
}
174
174
175
175
private function buildDescriptionView(PholioMock $mock) {
176
-
177
176
$viewer = $this->getViewer();
177
+
178
178
$properties = id(new PHUIPropertyListView())
179
179
->setUser($viewer);
180
180
$description = $mock->getDescription();
181
181
182
182
if (strlen($description)) {
183
-
$properties->addImageContent($description);
183
+
$properties->addTextContent(
184
+
new PHUIRemarkupView($viewer, $description));
184
185
return id(new PHUIObjectBoxView())
185
186
->setHeaderText(pht('Mock Description'))
186
187
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+11
-1
src/applications/pholio/view/PholioMockImagesView.php
+11
-1
src/applications/pholio/view/PholioMockImagesView.php
···
92
92
$current_set++;
93
93
}
94
94
95
+
$description = $engine->getOutput($image, 'default');
96
+
if (strlen($description)) {
97
+
$description = phutil_tag(
98
+
'div',
99
+
array(
100
+
'class' => 'phabricator-remarkup',
101
+
),
102
+
$description);
103
+
}
104
+
95
105
$history_uri = '/pholio/image/history/'.$image->getID().'/';
96
106
$images[] = array(
97
107
'id' => $image->getID(),
···
105
115
'width' => $x,
106
116
'height' => $y,
107
117
'title' => $image->getName(),
108
-
'descriptionMarkup' => $engine->getOutput($image, 'default'),
118
+
'descriptionMarkup' => $description,
109
119
'isObsolete' => (bool)$image->getIsObsolete(),
110
120
'isImage' => $file->isViewableImage(),
111
121
'isViewable' => $file->isViewableInBrowser(),