Page MenuHomePhabricator

D13899.id33555.diff
No OneTemporary

D13899.id33555.diff

diff --git a/src/applications/ponder/constants/PonderQuestionStatus.php b/src/applications/ponder/constants/PonderQuestionStatus.php
--- a/src/applications/ponder/constants/PonderQuestionStatus.php
+++ b/src/applications/ponder/constants/PonderQuestionStatus.php
@@ -7,9 +7,6 @@
const STATUS_CLOSED_OBSOLETE = 'obsolete';
const STATUS_CLOSED_DUPLICATE = 'duplicate';
- const ANSWER_STATUS_VISIBLE = 'visible';
- const ANSWER_STATUS_HIDDEN = 'hidden';
-
public static function getQuestionStatusMap() {
return array(
self::STATUS_OPEN => pht('Open'),
@@ -89,20 +86,4 @@
);
}
- public static function getAnswerStatusMap() {
- return array(
- self::ANSWER_STATUS_VISIBLE => pht('Visible'),
- self::ANSWER_STATUS_HIDDEN => pht('Hidden'),
- );
- }
-
- public static function getAnswerStatusName($status) {
- $map = array(
- self::ANSWER_STATUS_VISIBLE => pht('Visible'),
- self::ANSWER_STATUS_HIDDEN => pht('Hidden'),
- );
- return idx($map, $status, pht('Unknown'));
- }
-
-
}
diff --git a/src/applications/ponder/controller/PonderQuestionEditController.php b/src/applications/ponder/controller/PonderQuestionEditController.php
--- a/src/applications/ponder/controller/PonderQuestionEditController.php
+++ b/src/applications/ponder/controller/PonderQuestionEditController.php
@@ -68,9 +68,11 @@
->setTransactionType(PonderQuestionTransaction::TYPE_CONTENT)
->setNewValue($v_content);
- $xactions[] = id(clone $template)
- ->setTransactionType(PonderQuestionTransaction::TYPE_STATUS)
- ->setNewValue($v_status);
+ if (!$is_new) {
+ $xactions[] = id(clone $template)
+ ->setTransactionType(PonderQuestionTransaction::TYPE_STATUS)
+ ->setNewValue($v_status);
+ }
$xactions[] = id(clone $template)
->setTransactionType(PhabricatorTransactions::TYPE_VIEW_POLICY)
diff --git a/src/applications/ponder/controller/PonderQuestionViewController.php b/src/applications/ponder/controller/PonderQuestionViewController.php
--- a/src/applications/ponder/controller/PonderQuestionViewController.php
+++ b/src/applications/ponder/controller/PonderQuestionViewController.php
@@ -171,23 +171,26 @@
$view->invokeWillRenderEvent();
- $view->addSectionHeader(
- pht('Details'),
- PHUIPropertyListView::ICON_SUMMARY);
-
- $view->addTextContent(
- array(
- phutil_tag(
- 'div',
- array(
- 'class' => 'phabricator-remarkup',
- ),
- PhabricatorMarkupEngine::renderOneObject(
+ $details = PhabricatorMarkupEngine::renderOneObject(
$question,
$question->getMarkupField(),
- $viewer)),
- ));
+ $viewer);
+ if ($details) {
+ $view->addSectionHeader(
+ pht('Details'),
+ PHUIPropertyListView::ICON_SUMMARY);
+
+ $view->addTextContent(
+ array(
+ phutil_tag(
+ 'div',
+ array(
+ 'class' => 'phabricator-remarkup',
+ ),
+ $details),
+ ));
+ }
return $view;
}

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 15, 5:40 PM (1 w, 12 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7699538
Default Alt Text
D13899.id33555.diff (3 KB)

Event Timeline