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 @@ -226,13 +226,7 @@ ->execute(); $view_capability = PhabricatorPolicyCapability::CAN_VIEW; $edit_capability = PhabricatorPolicyCapability::CAN_EDIT; - $codex = id(PhabricatorPolicyCodex::newFromObject($document, $viewer)) - ->setCapability($view_capability); - $view_capability_description = $codex->getPolicySpecialRuleForCapability( - PhabricatorPolicyCapability::CAN_VIEW)->getDescription(); - $edit_capability_description = $codex->getPolicySpecialRuleForCapability( - PhabricatorPolicyCapability::CAN_EDIT)->getDescription(); $form = id(new AphrontFormView()) ->setUser($viewer) @@ -279,15 +273,13 @@ ->setSpacePHID($v_space) ->setPolicyObject($document) ->setCapability($view_capability) - ->setPolicies($policies) - ->setCaption($view_capability_description)) + ->setPolicies($policies)) ->appendChild( id(new AphrontFormPolicyControl()) ->setName('editPolicy') ->setPolicyObject($document) ->setCapability($edit_capability) - ->setPolicies($policies) - ->setCaption($edit_capability_description)) + ->setPolicies($policies)) ->appendChild( id(new AphrontFormTextControl()) ->setLabel(pht('Edit Notes')) @@ -323,17 +315,17 @@ $crumbs->setBorder(true); $view = id(new PHUITwoColumnView()) - ->setFooter(array( - $draft_note, - $form_box, - $preview, - )); + ->setFooter( + array( + $draft_note, + $form_box, + $preview, + )); return $this->newPage() ->setTitle($page_title) ->setCrumbs($crumbs) ->appendChild($view); - } } diff --git a/src/view/form/control/AphrontFormPolicyControl.php b/src/view/form/control/AphrontFormPolicyControl.php --- a/src/view/form/control/AphrontFormPolicyControl.php +++ b/src/view/form/control/AphrontFormPolicyControl.php @@ -279,7 +279,6 @@ ->setIcon($icon); } - if ($this->templatePHIDType) { $context_path = 'template/'.$this->templatePHIDType.'/'; } else { @@ -346,15 +345,6 @@ )), $input, )); - - return AphrontFormSelectControl::renderSelectTag( - $this->getValue(), - $this->getOptions(), - array( - 'name' => $this->getName(), - 'disabled' => $this->getDisabled() ? 'disabled' : null, - 'id' => $this->getID(), - )); } public static function getSelectCustomKey() {