diff --git a/resources/celerity/map.php b/resources/celerity/map.php --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -10,7 +10,7 @@ 'conpherence.pkg.css' => '2f25eb4f', 'conpherence.pkg.js' => '020aebcf', 'core.pkg.css' => '112931ab', - 'core.pkg.js' => '820af51e', + 'core.pkg.js' => 'd9e681ec', 'dark-console.pkg.js' => '187792c2', 'differential.pkg.css' => '94bb10ca', 'differential.pkg.js' => '46fcb3af', @@ -365,7 +365,7 @@ 'rsrc/js/application/calendar/behavior-event-all-day.js' => '0b1bc990', 'rsrc/js/application/calendar/behavior-month-view.js' => '158c64e0', 'rsrc/js/application/config/behavior-reorder-fields.js' => '2539f834', - 'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => 'aec8e38c', + 'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => 'b314366e', 'rsrc/js/application/conpherence/behavior-conpherence-search.js' => '91befbcc', 'rsrc/js/application/conpherence/behavior-durable-column.js' => 'fa6f30b2', 'rsrc/js/application/conpherence/behavior-menu.js' => '8c2ed2bf', @@ -556,7 +556,7 @@ 'conpherence-message-pane-css' => '50b1345e', 'conpherence-notification-css' => '85c48def', 'conpherence-participant-pane-css' => '69e0058a', - 'conpherence-thread-manager' => 'aec8e38c', + 'conpherence-thread-manager' => 'b314366e', 'conpherence-transaction-css' => '3a3f5e7e', 'd3' => 'e97b4b78', 'diff-tree-view-css' => 'e2d3e222', @@ -1893,17 +1893,6 @@ 'javelin-typeahead-ondemand-source', 'javelin-util', ), - 'aec8e38c' => array( - 'javelin-dom', - 'javelin-util', - 'javelin-stratcom', - 'javelin-install', - 'javelin-aphlict', - 'javelin-workflow', - 'javelin-router', - 'javelin-behavior-device', - 'javelin-vector', - ), 'b105a3a6' => array( 'javelin-behavior', 'javelin-stratcom', @@ -1914,6 +1903,17 @@ 'javelin-stratcom', 'javelin-dom', ), + 'b314366e' => array( + 'javelin-dom', + 'javelin-util', + 'javelin-stratcom', + 'javelin-install', + 'javelin-aphlict', + 'javelin-workflow', + 'javelin-router', + 'javelin-behavior-device', + 'javelin-vector', + ), 'b347a301' => array( 'javelin-behavior', ), diff --git a/src/applications/conpherence/application/PhabricatorConpherenceApplication.php b/src/applications/conpherence/application/PhabricatorConpherenceApplication.php --- a/src/applications/conpherence/application/PhabricatorConpherenceApplication.php +++ b/src/applications/conpherence/application/PhabricatorConpherenceApplication.php @@ -63,7 +63,7 @@ => 'ConpherenceParticipantController', 'preferences/(?P[1-9]\d*)/' => 'ConpherenceRoomPreferencesController', - 'update/(?P[1-9]\d*)/' + 'edit/(?P[1-9]\d*)/' => 'ConpherenceUpdateController', ), ); diff --git a/src/applications/conpherence/controller/ConpherenceController.php b/src/applications/conpherence/controller/ConpherenceController.php --- a/src/applications/conpherence/controller/ConpherenceController.php +++ b/src/applications/conpherence/controller/ConpherenceController.php @@ -29,7 +29,7 @@ ->setName(pht('Edit Room')) ->setType(PHUIListItemView::TYPE_LINK) ->setHref( - $this->getApplicationURI('update/'.$conpherence->getID()).'/') + $this->getApplicationURI('edit/'.$conpherence->getID()).'/') ->setWorkflow(true)); $nav->addMenuItem( @@ -135,7 +135,7 @@ if (!$participating) { $action = ConpherenceUpdateActions::JOIN_ROOM; - $uri = $this->getApplicationURI("update/{$id}/"); + $uri = $this->getApplicationURI("edit/{$id}/"); $button = phutil_tag( 'button', array( diff --git a/src/applications/conpherence/controller/ConpherenceParticipantController.php b/src/applications/conpherence/controller/ConpherenceParticipantController.php --- a/src/applications/conpherence/controller/ConpherenceParticipantController.php +++ b/src/applications/conpherence/controller/ConpherenceParticipantController.php @@ -24,7 +24,7 @@ return new Aphront404Response(); } - $uri = $this->getApplicationURI('update/'.$conpherence->getID().'/'); + $uri = $this->getApplicationURI('edit/'.$conpherence->getID().'/'); $content = id(new ConpherenceParticipantView()) ->setUser($this->getViewer()) ->setConpherence($conpherence) diff --git a/src/applications/conpherence/controller/ConpherenceUpdateController.php b/src/applications/conpherence/controller/ConpherenceUpdateController.php --- a/src/applications/conpherence/controller/ConpherenceUpdateController.php +++ b/src/applications/conpherence/controller/ConpherenceUpdateController.php @@ -204,7 +204,7 @@ $dialog ->setUser($user) ->setWidth(AphrontDialogView::WIDTH_FORM) - ->setSubmitURI($this->getApplicationURI('update/'.$conpherence_id.'/')) + ->setSubmitURI($this->getApplicationURI('edit/'.$conpherence_id.'/')) ->addSubmitButton() ->addCancelButton($this->getApplicationURI($conpherence->getID().'/')); @@ -373,7 +373,7 @@ $rendered_transactions = idx($data, 'transactions'); $new_latest_transaction_id = idx($data, 'latest_transaction_id'); - $update_uri = $this->getApplicationURI('update/'.$conpherence->getID().'/'); + $update_uri = $this->getApplicationURI('edit/'.$conpherence->getID().'/'); $nav_item = null; $header = null; $people_widget = null; diff --git a/src/applications/conpherence/controller/ConpherenceViewController.php b/src/applications/conpherence/controller/ConpherenceViewController.php --- a/src/applications/conpherence/controller/ConpherenceViewController.php +++ b/src/applications/conpherence/controller/ConpherenceViewController.php @@ -147,7 +147,7 @@ $draft = PhabricatorDraft::newFromUserAndKey( $user, $conpherence->getPHID()); - $update_uri = $this->getApplicationURI('update/'.$conpherence->getID().'/'); + $update_uri = $this->getApplicationURI('edit/'.$conpherence->getID().'/'); if ($user->isLoggedIn()) { $this->initBehavior('conpherence-pontificate'); diff --git a/src/applications/conpherence/view/ConpherenceDurableColumnView.php b/src/applications/conpherence/view/ConpherenceDurableColumnView.php --- a/src/applications/conpherence/view/ConpherenceDurableColumnView.php +++ b/src/applications/conpherence/view/ConpherenceDurableColumnView.php @@ -356,7 +356,7 @@ $actions[] = array( 'name' => pht('Add Participants'), 'disabled' => !$can_edit, - 'href' => '/conpherence/update/'.$conpherence->getID().'/', + 'href' => '/conpherence/edit/'.$conpherence->getID().'/', 'icon' => 'fa-plus', 'key' => ConpherenceUpdateActions::ADD_PERSON, ); @@ -457,7 +457,7 @@ $this->getUser(), array( 'method' => 'POST', - 'action' => '/conpherence/update/'.$id.'/', + 'action' => '/conpherence/edit/'.$id.'/', 'sigil' => 'conpherence-message-form', ), array( diff --git a/webroot/rsrc/js/application/conpherence/ConpherenceThreadManager.js b/webroot/rsrc/js/application/conpherence/ConpherenceThreadManager.js --- a/webroot/rsrc/js/application/conpherence/ConpherenceThreadManager.js +++ b/webroot/rsrc/js/application/conpherence/ConpherenceThreadManager.js @@ -512,7 +512,7 @@ }, _getUpdateURI: function() { - return '/conpherence/update/' + this._loadedThreadID + '/'; + return '/conpherence/edit/' + this._loadedThreadID + '/'; }, _getMoreMessagesURI: function() {