Page MenuHomePhorge
Files F2988994

No OneTemporary
Actions

View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index a6dc0d4837..30f59f2f0c 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,7 +10,7 @@ return array(
'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 @@ return array(
'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 @@ return array(
'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 @@ return array(
'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 @@ return array(
'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
index f3118be9bf..7a5913537e 100644
--- a/src/applications/conpherence/application/PhabricatorConpherenceApplication.php
+++ b/src/applications/conpherence/application/PhabricatorConpherenceApplication.php
@@ -63,7 +63,7 @@ final class PhabricatorConpherenceApplication extends PhabricatorApplication {
=> 'ConpherenceParticipantController',
'preferences/(?P<id>[1-9]\d*)/'
=> 'ConpherenceRoomPreferencesController',
- 'update/(?P<id>[1-9]\d*)/'
+ 'edit/(?P<id>[1-9]\d*)/'
=> 'ConpherenceUpdateController',
),
);
diff --git a/src/applications/conpherence/controller/ConpherenceController.php b/src/applications/conpherence/controller/ConpherenceController.php
index f47e7bf1ad..fc1127e0a3 100644
--- a/src/applications/conpherence/controller/ConpherenceController.php
+++ b/src/applications/conpherence/controller/ConpherenceController.php
@@ -29,7 +29,7 @@ abstract class ConpherenceController extends PhabricatorController {
->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 @@ abstract class ConpherenceController extends PhabricatorController {
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
index a82439f311..b141e0134c 100644
--- a/src/applications/conpherence/controller/ConpherenceParticipantController.php
+++ b/src/applications/conpherence/controller/ConpherenceParticipantController.php
@@ -24,7 +24,7 @@ final class ConpherenceParticipantController extends ConpherenceController {
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
index cbac0779db..1713324b5a 100644
--- a/src/applications/conpherence/controller/ConpherenceUpdateController.php
+++ b/src/applications/conpherence/controller/ConpherenceUpdateController.php
@@ -204,7 +204,7 @@ final class ConpherenceUpdateController
$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 @@ final class ConpherenceUpdateController
$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
index 4ac953a0e2..ac0240e418 100644
--- a/src/applications/conpherence/controller/ConpherenceViewController.php
+++ b/src/applications/conpherence/controller/ConpherenceViewController.php
@@ -147,7 +147,7 @@ final class ConpherenceViewController extends
$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
index be8a170cfb..835ffe1de8 100644
--- a/src/applications/conpherence/view/ConpherenceDurableColumnView.php
+++ b/src/applications/conpherence/view/ConpherenceDurableColumnView.php
@@ -356,7 +356,7 @@ final class ConpherenceDurableColumnView extends AphrontTagView {
$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 @@ final class ConpherenceDurableColumnView extends AphrontTagView {
$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
index 81e10bf35b..4959bca0b3 100644
--- a/webroot/rsrc/js/application/conpherence/ConpherenceThreadManager.js
+++ b/webroot/rsrc/js/application/conpherence/ConpherenceThreadManager.js
@@ -512,7 +512,7 @@ JX.install('ConpherenceThreadManager', {
},
_getUpdateURI: function() {
- return '/conpherence/update/' + this._loadedThreadID + '/';
+ return '/conpherence/edit/' + this._loadedThreadID + '/';
},
_getMoreMessagesURI: function() {

File Metadata

Mime Type
text/x-diff
Expires
Sat, Feb 22, 18:19 (16 h, 5 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
1179158
Default Alt Text
(8 KB)

Event Timeline

Content licensed under Creative Commons Attribution-ShareAlike 4.0 (CC-BY-SA) unless otherwise noted; code licensed under Apache 2.0 or other open source licenses. · CC BY-SA 4.0 · Apache 2.0