Page MenuHomePhabricator
Files F15354238

D15849.diff
No OneTemporary
Actions

D15849.diff
View Options

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -763,7 +763,6 @@
'DiffusionRepositoryListController' => 'applications/diffusion/controller/DiffusionRepositoryListController.php',
'DiffusionRepositoryManageController' => 'applications/diffusion/controller/DiffusionRepositoryManageController.php',
'DiffusionRepositoryManagementPanel' => 'applications/diffusion/management/DiffusionRepositoryManagementPanel.php',
- 'DiffusionRepositoryNewController' => 'applications/diffusion/controller/DiffusionRepositoryNewController.php',
'DiffusionRepositoryPath' => 'applications/diffusion/data/DiffusionRepositoryPath.php',
'DiffusionRepositoryPoliciesManagementPanel' => 'applications/diffusion/management/DiffusionRepositoryPoliciesManagementPanel.php',
'DiffusionRepositoryRef' => 'applications/diffusion/data/DiffusionRepositoryRef.php',
@@ -4979,7 +4978,6 @@
'DiffusionRepositoryListController' => 'DiffusionController',
'DiffusionRepositoryManageController' => 'DiffusionController',
'DiffusionRepositoryManagementPanel' => 'Phobject',
- 'DiffusionRepositoryNewController' => 'DiffusionController',
'DiffusionRepositoryPath' => 'Phobject',
'DiffusionRepositoryPoliciesManagementPanel' => 'DiffusionRepositoryManagementPanel',
'DiffusionRepositoryRef' => 'Phobject',
diff --git a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
--- a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
+++ b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
@@ -59,9 +59,6 @@
=> 'DiffusionRepositoryListController',
$this->getEditRoutePattern('edit/') =>
'DiffusionRepositoryEditproController',
- 'new/' => 'DiffusionRepositoryNewController',
- '(?P<edit>create)/' => 'DiffusionRepositoryCreateController',
- '(?P<edit>import)/' => 'DiffusionRepositoryCreateController',
'pushlog/' => array(
'(?:query/(?P<queryKey>[^/]+)/)?' => 'DiffusionPushLogListController',
'view/(?P<id>\d+)/' => 'DiffusionPushEventViewController',
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryNewController.php b/src/applications/diffusion/controller/DiffusionRepositoryNewController.php
deleted file mode 100644
--- a/src/applications/diffusion/controller/DiffusionRepositoryNewController.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-final class DiffusionRepositoryNewController extends DiffusionController {
-
- public function handleRequest(AphrontRequest $request) {
- $viewer = $this->getViewer();
-
- $this->requireApplicationCapability(
- DiffusionCreateRepositoriesCapability::CAPABILITY);
-
- if ($request->isFormPost()) {
- if ($request->getStr('type')) {
- switch ($request->getStr('type')) {
- case 'create':
- $uri = $this->getApplicationURI('create/');
- break;
- case 'import':
- default:
- $uri = $this->getApplicationURI('import/');
- break;
- }
-
- return id(new AphrontRedirectResponse())->setURI($uri);
- }
- }
-
- $doc_href = PhabricatorEnv::getDoclink(
- 'Diffusion User Guide: Repository Hosting');
-
- $doc_link = phutil_tag(
- 'a',
- array(
- 'href' => $doc_href,
- 'target' => '_blank',
- ),
- pht('Diffusion User Guide: Repository Hosting'));
-
- $form = id(new AphrontFormView())
- ->setUser($viewer)
- ->appendChild(
- id(new AphrontFormRadioButtonControl())
- ->setName('type')
- ->addButton(
- 'create',
- pht('Create a New Hosted Repository'),
- array(
- pht(
- 'Create a new, empty repository which Phabricator will host. '.
- 'For instructions on configuring repository hosting, see %s.',
- $doc_link),
- ))
- ->addButton(
- 'import',
- pht('Import an Existing External Repository'),
- pht(
- "Import a repository hosted somewhere else, like GitHub, ".
- "Bitbucket, or your organization's existing servers. ".
- "Phabricator will read changes from the repository but will ".
- "not host or manage it. The authoritative master version of ".
- "the repository will stay where it is now.")))
- ->appendChild(
- id(new AphrontFormSubmitControl())
- ->setValue(pht('Continue'))
- ->addCancelButton($this->getApplicationURI()));
-
- $crumbs = $this->buildApplicationCrumbs();
- $crumbs->addTextCrumb(pht('New Repository'));
-
- $form_box = id(new PHUIObjectBoxView())
- ->setHeaderText(pht('Create or Import Repository'))
- ->setForm($form);
-
- return $this->newPage()
- ->setTitle(pht('New Repository'))
- ->setCrumbs($crumbs)
- ->appendChild($form_box);
- }
-
-}
diff --git a/src/applications/repository/query/PhabricatorRepositorySearchEngine.php b/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
--- a/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
+++ b/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
@@ -242,16 +242,10 @@
protected function getNewUserBody() {
- $import_button = id(new PHUIButtonView())
+ $new_button = id(new PHUIButtonView())
->setTag('a')
- ->setText(pht('Import Repository'))
- ->setHref('/diffusion/import/')
- ->setColor(PHUIButtonView::GREEN);
-
- $create_button = id(new PHUIButtonView())
- ->setTag('a')
- ->setText(pht('Create Repository'))
- ->setHref('/diffusion/create/')
+ ->setText(pht('New Repository'))
+ ->setHref('/diffusion/edit/')
->setColor(PHUIButtonView::GREEN);
$icon = $this->getApplication()->getIcon();
@@ -261,8 +255,7 @@
->setTitle(pht('Welcome to %s', $app_name))
->setDescription(
pht('Import, create, or just browse repositories in Diffusion.'))
- ->addAction($import_button)
- ->addAction($create_button);
+ ->addAction($new_button);
return $view;
}

File Metadata

Mime Type
text/plain
Expires
Wed, Mar 12, 2:51 AM (7 h, 4 m ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7390344
Default Alt Text
D15849.diff (6 KB)

Event Timeline

Phabricator · Built by Phacility