diff --git a/src/applications/nuance/controller/NuanceItemEditController.php b/src/applications/nuance/controller/NuanceItemEditController.php index b5e02cbda6..89bfbda5c9 100644 --- a/src/applications/nuance/controller/NuanceItemEditController.php +++ b/src/applications/nuance/controller/NuanceItemEditController.php @@ -1,49 +1,32 @@ getViewer(); + $id = $request->getURIData('id'); - public function setItemID($item_id) { - $this->itemID = $item_id; - return $this; - } - public function getItemID() { - return $this->itemID; - } - - public function willProcessRequest(array $data) { - $this->setItemID(idx($data, 'id')); - } - - public function processRequest() { - $request = $this->getRequest(); - $user = $request->getUser(); - - $item_id = $this->getItemID(); - $is_new = !$item_id; - - if ($is_new) { + if (!$id) { $item = new NuanceItem(); } else { $item = id(new NuanceItemQuery()) - ->setViewer($user) - ->withIDs(array($item_id)) + ->setViewer($viewer) + ->withIDs(array($id)) ->executeOne(); } if (!$item) { return new Aphront404Response(); } $crumbs = $this->buildApplicationCrumbs(); $title = 'TODO'; return $this->buildApplicationPage( $crumbs, array( 'title' => $title, )); } } diff --git a/src/applications/nuance/controller/NuanceItemViewController.php b/src/applications/nuance/controller/NuanceItemViewController.php index e0ba457e89..9c7401cafe 100644 --- a/src/applications/nuance/controller/NuanceItemViewController.php +++ b/src/applications/nuance/controller/NuanceItemViewController.php @@ -1,42 +1,27 @@ getViewer(); + $id = $request->getURIData('id'); - public function setItemID($item_id) { - $this->itemID = $item_id; - return $this; - } - public function getItemID() { - return $this->itemID; - } - - public function willProcessRequest(array $data) { - $this->setItemID($data['id']); - } - - public function processRequest() { - $request = $this->getRequest(); - $user = $request->getUser(); - - $item_id = $this->getItemID(); $item = id(new NuanceItemQuery()) - ->setViewer($user) - ->withIDs(array($item_id)) + ->setViewer($viewer) + ->withIDs(array($id)) ->executeOne(); if (!$item) { return new Aphront404Response(); } $crumbs = $this->buildApplicationCrumbs(); $title = 'TODO'; return $this->buildApplicationPage( $crumbs, array( 'title' => $title, )); } } diff --git a/src/applications/nuance/controller/NuanceRequestorEditController.php b/src/applications/nuance/controller/NuanceRequestorEditController.php index 42405a227f..2efc49f711 100644 --- a/src/applications/nuance/controller/NuanceRequestorEditController.php +++ b/src/applications/nuance/controller/NuanceRequestorEditController.php @@ -1,50 +1,33 @@ getViewer(); + $id = $request->getURIData('id'); - public function setRequestorID($requestor_id) { - $this->requestorID = $requestor_id; - return $this; - } - public function getRequestorID() { - return $this->requestorID; - } - - public function willProcessRequest(array $data) { - $this->setRequestorID(idx($data, 'id')); - } - - public function processRequest() { - $request = $this->getRequest(); - $user = $request->getUser(); - - $requestor_id = $this->getRequestorID(); - $is_new = !$requestor_id; - - if ($is_new) { + if (!$id) { $requestor = new NuanceRequestor(); } else { $requestor = id(new NuanceRequestorQuery()) - ->setViewer($user) - ->withIDs(array($requestor_id)) + ->setViewer($viewer) + ->withIDs(array($id)) ->executeOne(); } if (!$requestor) { return new Aphront404Response(); } $crumbs = $this->buildApplicationCrumbs(); $title = pht('TODO'); return $this->buildApplicationPage( $crumbs, array( 'title' => $title, )); } } diff --git a/src/applications/nuance/controller/NuanceRequestorViewController.php b/src/applications/nuance/controller/NuanceRequestorViewController.php index 08dcedb62a..8f6912c4d7 100644 --- a/src/applications/nuance/controller/NuanceRequestorViewController.php +++ b/src/applications/nuance/controller/NuanceRequestorViewController.php @@ -1,42 +1,27 @@ getViewer(); + $id = $request->getURIData('id'); - public function setRequestorID($requestor_id) { - $this->requestorID = $requestor_id; - return $this; - } - public function getRequestorID() { - return $this->requestorID; - } - - public function willProcessRequest(array $data) { - $this->setRequestorID($data['id']); - } - - public function processRequest() { - $request = $this->getRequest(); - $user = $request->getUser(); - - $requestor_id = $this->getRequestorID(); $requestor = id(new NuanceRequestorQuery()) - ->setViewer($user) - ->withIDs(array($requestor_id)) + ->setViewer($viewer) + ->withIDs(array($id)) ->executeOne(); if (!$requestor) { return new Aphront404Response(); } $crumbs = $this->buildApplicationCrumbs(); $title = 'TODO'; return $this->buildApplicationPage( $crumbs, array( 'title' => $title, )); } }