1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-26 23:40:57 +01:00

Rename "Local" settings in Diffusion to "Storage"

Summary: Ref T2783. In Diffusion -> Edit Repository, we currently have a section called "Local" with options about where the repository is stored. The current name is misleading in a cluster environment, where storage may not actually be local. Shortly, this will also have an option for cluster storage. Call this "Storage" instead.

Test Plan: Edited a repository and poked around.

Reviewers: btrahan

Reviewed By: btrahan

Subscribers: epriestley

Maniphest Tasks: T2783

Differential Revision: https://secure.phabricator.com/D11001
This commit is contained in:
epriestley 2014-12-17 11:13:49 -08:00
parent 3fa519da74
commit d8739459f6
4 changed files with 16 additions and 16 deletions

View file

@ -556,8 +556,8 @@ phutil_register_library_map(array(
'DiffusionRepositoryEditDeleteController' => 'applications/diffusion/controller/DiffusionRepositoryEditDeleteController.php', 'DiffusionRepositoryEditDeleteController' => 'applications/diffusion/controller/DiffusionRepositoryEditDeleteController.php',
'DiffusionRepositoryEditEncodingController' => 'applications/diffusion/controller/DiffusionRepositoryEditEncodingController.php', 'DiffusionRepositoryEditEncodingController' => 'applications/diffusion/controller/DiffusionRepositoryEditEncodingController.php',
'DiffusionRepositoryEditHostingController' => 'applications/diffusion/controller/DiffusionRepositoryEditHostingController.php', 'DiffusionRepositoryEditHostingController' => 'applications/diffusion/controller/DiffusionRepositoryEditHostingController.php',
'DiffusionRepositoryEditLocalController' => 'applications/diffusion/controller/DiffusionRepositoryEditLocalController.php',
'DiffusionRepositoryEditMainController' => 'applications/diffusion/controller/DiffusionRepositoryEditMainController.php', 'DiffusionRepositoryEditMainController' => 'applications/diffusion/controller/DiffusionRepositoryEditMainController.php',
'DiffusionRepositoryEditStorageController' => 'applications/diffusion/controller/DiffusionRepositoryEditStorageController.php',
'DiffusionRepositoryEditSubversionController' => 'applications/diffusion/controller/DiffusionRepositoryEditSubversionController.php', 'DiffusionRepositoryEditSubversionController' => 'applications/diffusion/controller/DiffusionRepositoryEditSubversionController.php',
'DiffusionRepositoryEditUpdateController' => 'applications/diffusion/controller/DiffusionRepositoryEditUpdateController.php', 'DiffusionRepositoryEditUpdateController' => 'applications/diffusion/controller/DiffusionRepositoryEditUpdateController.php',
'DiffusionRepositoryListController' => 'applications/diffusion/controller/DiffusionRepositoryListController.php', 'DiffusionRepositoryListController' => 'applications/diffusion/controller/DiffusionRepositoryListController.php',
@ -3571,8 +3571,8 @@ phutil_register_library_map(array(
'DiffusionRepositoryEditDeleteController' => 'DiffusionRepositoryEditController', 'DiffusionRepositoryEditDeleteController' => 'DiffusionRepositoryEditController',
'DiffusionRepositoryEditEncodingController' => 'DiffusionRepositoryEditController', 'DiffusionRepositoryEditEncodingController' => 'DiffusionRepositoryEditController',
'DiffusionRepositoryEditHostingController' => 'DiffusionRepositoryEditController', 'DiffusionRepositoryEditHostingController' => 'DiffusionRepositoryEditController',
'DiffusionRepositoryEditLocalController' => 'DiffusionRepositoryEditController',
'DiffusionRepositoryEditMainController' => 'DiffusionRepositoryEditController', 'DiffusionRepositoryEditMainController' => 'DiffusionRepositoryEditController',
'DiffusionRepositoryEditStorageController' => 'DiffusionRepositoryEditController',
'DiffusionRepositoryEditSubversionController' => 'DiffusionRepositoryEditController', 'DiffusionRepositoryEditSubversionController' => 'DiffusionRepositoryEditController',
'DiffusionRepositoryEditUpdateController' => 'DiffusionRepositoryEditController', 'DiffusionRepositoryEditUpdateController' => 'DiffusionRepositoryEditController',
'DiffusionRepositoryListController' => 'DiffusionController', 'DiffusionRepositoryListController' => 'DiffusionController',

View file

@ -88,7 +88,7 @@ final class PhabricatorDiffusionApplication extends PhabricatorApplication {
'actions/' => 'DiffusionRepositoryEditActionsController', 'actions/' => 'DiffusionRepositoryEditActionsController',
'(?P<edit>remote)/' => 'DiffusionRepositoryCreateController', '(?P<edit>remote)/' => 'DiffusionRepositoryCreateController',
'(?P<edit>policy)/' => 'DiffusionRepositoryCreateController', '(?P<edit>policy)/' => 'DiffusionRepositoryCreateController',
'local/' => 'DiffusionRepositoryEditLocalController', 'storage/' => 'DiffusionRepositoryEditStorageController',
'delete/' => 'DiffusionRepositoryEditDeleteController', 'delete/' => 'DiffusionRepositoryEditDeleteController',
'hosting/' => 'DiffusionRepositoryEditHostingController', 'hosting/' => 'DiffusionRepositoryEditHostingController',
'(?P<serve>serve)/' => 'DiffusionRepositoryEditHostingController', '(?P<serve>serve)/' => 'DiffusionRepositoryEditHostingController',

View file

@ -82,11 +82,11 @@ final class DiffusionRepositoryEditMainController
$this->buildSubversionActions($repository)); $this->buildSubversionActions($repository));
} }
$local_properties = null; $storage_properties = null;
if ($has_local) { if ($has_local) {
$local_properties = $this->buildLocalProperties( $storage_properties = $this->buildStorageProperties(
$repository, $repository,
$this->buildLocalActions($repository)); $this->buildStorageActions($repository));
} }
$actions_properties = $this->buildActionsProperties( $actions_properties = $this->buildActionsProperties(
@ -140,10 +140,10 @@ final class DiffusionRepositoryEditMainController
->addPropertyList($remote_properties); ->addPropertyList($remote_properties);
} }
if ($local_properties) { if ($storage_properties) {
$boxes[] = id(new PHUIObjectBoxView()) $boxes[] = id(new PHUIObjectBoxView())
->setHeaderText(pht('Local')) ->setHeaderText(pht('Storage'))
->addPropertyList($local_properties); ->addPropertyList($storage_properties);
} }
$boxes[] = id(new PHUIObjectBoxView()) $boxes[] = id(new PHUIObjectBoxView())
@ -548,7 +548,7 @@ final class DiffusionRepositoryEditMainController
return $view; return $view;
} }
private function buildLocalActions(PhabricatorRepository $repository) { private function buildStorageActions(PhabricatorRepository $repository) {
$viewer = $this->getRequest()->getUser(); $viewer = $this->getRequest()->getUser();
$view = id(new PhabricatorActionListView()) $view = id(new PhabricatorActionListView())
@ -557,15 +557,15 @@ final class DiffusionRepositoryEditMainController
$edit = id(new PhabricatorActionView()) $edit = id(new PhabricatorActionView())
->setIcon('fa-pencil') ->setIcon('fa-pencil')
->setName(pht('Edit Local')) ->setName(pht('Edit Storage'))
->setHref( ->setHref(
$this->getRepositoryControllerURI($repository, 'edit/local/')); $this->getRepositoryControllerURI($repository, 'edit/storage/'));
$view->addAction($edit); $view->addAction($edit);
return $view; return $view;
} }
private function buildLocalProperties( private function buildStorageProperties(
PhabricatorRepository $repository, PhabricatorRepository $repository,
PhabricatorActionListView $actions) { PhabricatorActionListView $actions) {
@ -576,7 +576,7 @@ final class DiffusionRepositoryEditMainController
->setActionList($actions); ->setActionList($actions);
$view->addProperty( $view->addProperty(
pht('Local Path'), pht('Storage Path'),
$repository->getHumanReadableDetail('local-path')); $repository->getHumanReadableDetail('local-path'));
return $view; return $view;

View file

@ -1,6 +1,6 @@
<?php <?php
final class DiffusionRepositoryEditLocalController final class DiffusionRepositoryEditStorageController
extends DiffusionRepositoryEditController { extends DiffusionRepositoryEditController {
public function processRequest() { public function processRequest() {
@ -29,7 +29,7 @@ final class DiffusionRepositoryEditLocalController
$errors = array(); $errors = array();
$crumbs = $this->buildApplicationCrumbs(); $crumbs = $this->buildApplicationCrumbs();
$crumbs->addTextCrumb(pht('Edit Local')); $crumbs->addTextCrumb(pht('Edit Storage'));
$title = pht('Edit %s', $repository->getName()); $title = pht('Edit %s', $repository->getName());