Begin transacitonalizing repository edits and provide a more sensible edit interface

Summary: Ref T2231, T603. Plan of attack here is pretty much: - Built out a new (currently not linked in the UI) edit interface in Diffusion which is transaction-based and has a sensible layout. - Build out a new create interface based on PagedForm which dumps into the new edit interface. - Throw the old stuff away. - Everyone lives happily ever after. Test Plan: {F44163} {F44164} Reviewers: chad, btrahan Reviewed By: btrahan CC: aran Maniphest Tasks: T2231 Differential Revision: https://secure.phabricator.com/D6029
2013-05-24 12:37:42 -07:00
parent 27ad838939
commit 2fd018ad92
10 changed files with 436 additions and 1 deletions
--- a/src/applications/diffusion/controller/DiffusionController.php
+++ b/src/applications/diffusion/controller/DiffusionController.php
@@ -334,4 +334,11 @@ abstract class DiffusionController extends PhabricatorController {
      $method,
      $params);
  }
+
+  protected function getRepositoryControllerURI(
+    PhabricatorRepository $repository,
+    $path) {
+    return $this->getApplicationURI($repository->getCallsign().'/'.$path);
+  }
+
 }
--- a/src/applications/diffusion/controller/DiffusionRepositoryEditBasicController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditBasicController.php
@@ -0,0 +1,115 @@
+<?php
+
+final class DiffusionRepositoryEditBasicController extends DiffusionController {
+
+  public function processRequest() {
+    $request = $this->getRequest();
+    $user = $request->getUser();
+    $drequest = $this->diffusionRequest;
+    $repository = $drequest->getRepository();
+
+    $repository = id(new PhabricatorRepositoryQuery())
+      ->setViewer($user)
+      ->requireCapabilities(
+        array(
+          PhabricatorPolicyCapability::CAN_VIEW,
+          PhabricatorPolicyCapability::CAN_EDIT,
+        ))
+      ->withIDs(array($repository->getID()))
+      ->executeOne();
+
+    if (!$repository) {
+      return new Aphront404Response();
+    }
+
+    $edit_uri = $this->getRepositoryControllerURI($repository, 'edit/');
+
+    $v_name = $repository->getName();
+    $v_desc = $repository->getDetail('description');
+    $e_name = true;
+    $errors = array();
+
+    if ($request->isFormPost()) {
+      $v_name = $request->getStr('name');
+      $v_desc = $request->getStr('description');
+
+      if (!strlen($v_name)) {
+        $e_name = pht('Required');
+        $errors[] = pht('Repository name is required.');
+      } else {
+        $e_name = null;
+      }
+
+      if (!$errors) {
+        $xactions = array();
+        $template = id(new PhabricatorRepositoryTransaction());
+
+        $type_name = PhabricatorRepositoryTransaction::TYPE_NAME;
+        $type_desc = PhabricatorRepositoryTransaction::TYPE_DESCRIPTION;
+
+        $xactions[] = id(clone $template)
+          ->setTransactionType($type_name)
+          ->setNewValue($v_name);
+
+        $xactions[] = id(clone $template)
+          ->setTransactionType($type_desc)
+          ->setNewValue($v_desc);
+
+        id(new PhabricatorRepositoryEditor())
+          ->setContinueOnNoEffect(true)
+          ->setContentSourceFromRequest($request)
+          ->setActor($user)
+          ->applyTransactions($repository, $xactions);
+
+        return id(new AphrontRedirectResponse())->setURI($edit_uri);
+      }
+    }
+
+    $content = array();
+
+    $crumbs = $this->buildCrumbs();
+    $crumbs->addCrumb(
+      id(new PhabricatorCrumbView())
+        ->setName(pht('Edit Basics')));
+    $content[] = $crumbs;
+
+    $title = pht('Edit %s', $repository->getName());
+
+    if ($errors) {
+      $content[] = id(new AphrontErrorView())
+        ->setTitle(pht('Form Errors'))
+        ->setErrors($errors);
+    }
+
+    $form = id(new AphrontFormView())
+      ->setUser($user)
+      ->setFlexible(true)
+      ->appendChild(
+        id(new AphrontFormTextControl())
+          ->setName('name')
+          ->setLabel(pht('Name'))
+          ->setValue($v_name)
+          ->setError($e_name))
+      ->appendChild(
+        id(new AphrontFormTextAreaControl())
+          ->setName('description')
+          ->setLabel(pht('Description'))
+          ->setValue($v_desc))
+      ->appendChild(
+        id(new AphrontFormSubmitControl())
+          ->setValue(pht('Save'))
+          ->addCancelButton($edit_uri));
+
+    $content[] = $form;
+
+    return $this->buildApplicationPage(
+      $content,
+      array(
+        'title' => $title,
+        'dust' => true,
+        'device' => true,
+      ));
+  }
+
+
+}
--- a/src/applications/diffusion/controller/DiffusionRepositoryEditController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryEditController.php
@@ -0,0 +1,112 @@
+<?php
+
+final class DiffusionRepositoryEditController extends DiffusionController {
+
+  public function processRequest() {
+    $request = $this->getRequest();
+    $user = $request->getUser();
+    $drequest = $this->diffusionRequest;
+    $repository = $drequest->getRepository();
+
+    $content = array();
+
+    $crumbs = $this->buildCrumbs();
+    $crumbs->addCrumb(
+      id(new PhabricatorCrumbView())
+        ->setName(pht('Edit')));
+    $content[] = $crumbs;
+
+    $title = pht('Edit %s', $repository->getName());
+
+    $content[] = id(new PhabricatorHeaderView())
+      ->setHeader($title);
+
+    $content[] = $this->buildBasicActions($repository);
+    $content[] = $this->buildBasicProperties($repository);
+
+
+    $content[] = id(new PhabricatorHeaderView())
+      ->setHeader(pht('Edit History'));
+
+    $xactions = id(new PhabricatorRepositoryTransactionQuery())
+      ->setViewer($user)
+      ->withObjectPHIDs(array($repository->getPHID()))
+      ->execute();
+
+    $engine = id(new PhabricatorMarkupEngine())
+      ->setViewer($user);
+    foreach ($xactions as $xaction) {
+      if ($xaction->getComment()) {
+        $engine->addObject(
+          $xaction->getComment(),
+          PhabricatorApplicationTransactionComment::MARKUP_FIELD_COMMENT);
+      }
+    }
+    $engine->process();
+
+    $xaction_view = id(new PhabricatorApplicationTransactionView())
+      ->setUser($user)
+      ->setTransactions($xactions)
+      ->setMarkupEngine($engine);
+
+    $content[] = $xaction_view;
+
+
+    return $this->buildApplicationPage(
+      $content,
+      array(
+        'title' => $title,
+        'device' => true,
+        'dust' => true,
+      ));
+  }
+
+  private function buildBasicActions(PhabricatorRepository $repository) {
+    $user = $this->getRequest()->getUser();
+
+    $view = id(new PhabricatorActionListView())
+      ->setUser($user);
+
+    $can_edit = PhabricatorPolicyFilter::hasCapability(
+      $user,
+      $repository,
+      PhabricatorPolicyCapability::CAN_EDIT);
+
+    $edit = id(new PhabricatorActionView())
+      ->setIcon('edit')
+      ->setName(pht('Edit Basic Information'))
+      ->setHref($this->getRepositoryControllerURI($repository, 'edit/basic/'))
+      ->setDisabled(!$can_edit);
+    $view->addAction($edit);
+
+    return $view;
+  }
+
+  private function buildBasicProperties(PhabricatorRepository $repository) {
+    $view = id(new PhabricatorPropertyListView())
+      ->setUser($this->getRequest()->getUser())
+      ->setObject($repository);
+
+    $view->addProperty(pht('Name'), $repository->getName());
+    $view->addProperty(pht('ID'), $repository->getID());
+    $view->addProperty(pht('PHID'), $repository->getPHID());
+
+    $type = PhabricatorRepositoryType::getNameForRepositoryType(
+      $repository->getVersionControlSystem());
+
+    $view->addProperty(pht('Type'), $type);
+    $view->addProperty(pht('Callsign'), $repository->getCallsign());
+
+    $description = $repository->getDetail('description');
+    if (!strlen($description)) {
+      $description = phutil_tag('em', array(), pht('None'));
+    }
+    $view->addProperty(pht('Description'), $description);
+
+
+    return $view;
+  }
+
+
+
+}