mirror of
https://we.phorge.it/source/phorge.git
synced 2025-02-22 19:49:02 +01:00
Fix editing Conpherence rooms on mobile
Summary: rPd6bce34a5db1a838a988440f09f7728747c9e067 failed to replace all occurrences of `$this->getApplicationURI('update/'.$conpherence->getID().'/')` with `$this->getApplicationURI('edit/'.$conpherence->getID().'/')`. Thus editing a Conpherence room on mobile crashes due to using an old invalid path. Closes T15513 Test Plan: * Run `grep -r "update/" . | grep onpherenc` vs `grep -r "edit/" . | grep onpherenc` and read rPd6bce34a5db1a838a988440f09f7728747c9e067 * Go to a Conpherence room in mobile view and select "Edit Room" * Go to a Conpherence room in desktop view and select "Edit Room" Reviewers: O1 Blessed Committers, valerio.bozzolan Reviewed By: O1 Blessed Committers, valerio.bozzolan Subscribers: tobiaswiese, valerio.bozzolan, Matthew, Cigaryno Maniphest Tasks: T15513 Differential Revision: https://we.phorge.it/D25879
This commit is contained in:
parent
5b87138894
commit
fd6118bfa6
8 changed files with 24 additions and 24 deletions
|
@ -10,7 +10,7 @@ return array(
|
||||||
'conpherence.pkg.css' => '2f25eb4f',
|
'conpherence.pkg.css' => '2f25eb4f',
|
||||||
'conpherence.pkg.js' => '020aebcf',
|
'conpherence.pkg.js' => '020aebcf',
|
||||||
'core.pkg.css' => '112931ab',
|
'core.pkg.css' => '112931ab',
|
||||||
'core.pkg.js' => '820af51e',
|
'core.pkg.js' => 'd9e681ec',
|
||||||
'dark-console.pkg.js' => '187792c2',
|
'dark-console.pkg.js' => '187792c2',
|
||||||
'differential.pkg.css' => '94bb10ca',
|
'differential.pkg.css' => '94bb10ca',
|
||||||
'differential.pkg.js' => '46fcb3af',
|
'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-event-all-day.js' => '0b1bc990',
|
||||||
'rsrc/js/application/calendar/behavior-month-view.js' => '158c64e0',
|
'rsrc/js/application/calendar/behavior-month-view.js' => '158c64e0',
|
||||||
'rsrc/js/application/config/behavior-reorder-fields.js' => '2539f834',
|
'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-conpherence-search.js' => '91befbcc',
|
||||||
'rsrc/js/application/conpherence/behavior-durable-column.js' => 'fa6f30b2',
|
'rsrc/js/application/conpherence/behavior-durable-column.js' => 'fa6f30b2',
|
||||||
'rsrc/js/application/conpherence/behavior-menu.js' => '8c2ed2bf',
|
'rsrc/js/application/conpherence/behavior-menu.js' => '8c2ed2bf',
|
||||||
|
@ -556,7 +556,7 @@ return array(
|
||||||
'conpherence-message-pane-css' => '50b1345e',
|
'conpherence-message-pane-css' => '50b1345e',
|
||||||
'conpherence-notification-css' => '85c48def',
|
'conpherence-notification-css' => '85c48def',
|
||||||
'conpherence-participant-pane-css' => '69e0058a',
|
'conpherence-participant-pane-css' => '69e0058a',
|
||||||
'conpherence-thread-manager' => 'aec8e38c',
|
'conpherence-thread-manager' => 'b314366e',
|
||||||
'conpherence-transaction-css' => '3a3f5e7e',
|
'conpherence-transaction-css' => '3a3f5e7e',
|
||||||
'd3' => 'e97b4b78',
|
'd3' => 'e97b4b78',
|
||||||
'diff-tree-view-css' => 'e2d3e222',
|
'diff-tree-view-css' => 'e2d3e222',
|
||||||
|
@ -1893,17 +1893,6 @@ return array(
|
||||||
'javelin-typeahead-ondemand-source',
|
'javelin-typeahead-ondemand-source',
|
||||||
'javelin-util',
|
'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(
|
'b105a3a6' => array(
|
||||||
'javelin-behavior',
|
'javelin-behavior',
|
||||||
'javelin-stratcom',
|
'javelin-stratcom',
|
||||||
|
@ -1914,6 +1903,17 @@ return array(
|
||||||
'javelin-stratcom',
|
'javelin-stratcom',
|
||||||
'javelin-dom',
|
'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(
|
'b347a301' => array(
|
||||||
'javelin-behavior',
|
'javelin-behavior',
|
||||||
),
|
),
|
||||||
|
|
|
@ -63,7 +63,7 @@ final class PhabricatorConpherenceApplication extends PhabricatorApplication {
|
||||||
=> 'ConpherenceParticipantController',
|
=> 'ConpherenceParticipantController',
|
||||||
'preferences/(?P<id>[1-9]\d*)/'
|
'preferences/(?P<id>[1-9]\d*)/'
|
||||||
=> 'ConpherenceRoomPreferencesController',
|
=> 'ConpherenceRoomPreferencesController',
|
||||||
'update/(?P<id>[1-9]\d*)/'
|
'edit/(?P<id>[1-9]\d*)/'
|
||||||
=> 'ConpherenceUpdateController',
|
=> 'ConpherenceUpdateController',
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|
|
@ -29,7 +29,7 @@ abstract class ConpherenceController extends PhabricatorController {
|
||||||
->setName(pht('Edit Room'))
|
->setName(pht('Edit Room'))
|
||||||
->setType(PHUIListItemView::TYPE_LINK)
|
->setType(PHUIListItemView::TYPE_LINK)
|
||||||
->setHref(
|
->setHref(
|
||||||
$this->getApplicationURI('update/'.$conpherence->getID()).'/')
|
$this->getApplicationURI('edit/'.$conpherence->getID()).'/')
|
||||||
->setWorkflow(true));
|
->setWorkflow(true));
|
||||||
|
|
||||||
$nav->addMenuItem(
|
$nav->addMenuItem(
|
||||||
|
@ -135,7 +135,7 @@ abstract class ConpherenceController extends PhabricatorController {
|
||||||
|
|
||||||
if (!$participating) {
|
if (!$participating) {
|
||||||
$action = ConpherenceUpdateActions::JOIN_ROOM;
|
$action = ConpherenceUpdateActions::JOIN_ROOM;
|
||||||
$uri = $this->getApplicationURI("update/{$id}/");
|
$uri = $this->getApplicationURI("edit/{$id}/");
|
||||||
$button = phutil_tag(
|
$button = phutil_tag(
|
||||||
'button',
|
'button',
|
||||||
array(
|
array(
|
||||||
|
|
|
@ -24,7 +24,7 @@ final class ConpherenceParticipantController extends ConpherenceController {
|
||||||
return new Aphront404Response();
|
return new Aphront404Response();
|
||||||
}
|
}
|
||||||
|
|
||||||
$uri = $this->getApplicationURI('update/'.$conpherence->getID().'/');
|
$uri = $this->getApplicationURI('edit/'.$conpherence->getID().'/');
|
||||||
$content = id(new ConpherenceParticipantView())
|
$content = id(new ConpherenceParticipantView())
|
||||||
->setUser($this->getViewer())
|
->setUser($this->getViewer())
|
||||||
->setConpherence($conpherence)
|
->setConpherence($conpherence)
|
||||||
|
|
|
@ -204,7 +204,7 @@ final class ConpherenceUpdateController
|
||||||
$dialog
|
$dialog
|
||||||
->setUser($user)
|
->setUser($user)
|
||||||
->setWidth(AphrontDialogView::WIDTH_FORM)
|
->setWidth(AphrontDialogView::WIDTH_FORM)
|
||||||
->setSubmitURI($this->getApplicationURI('update/'.$conpherence_id.'/'))
|
->setSubmitURI($this->getApplicationURI('edit/'.$conpherence_id.'/'))
|
||||||
->addSubmitButton()
|
->addSubmitButton()
|
||||||
->addCancelButton($this->getApplicationURI($conpherence->getID().'/'));
|
->addCancelButton($this->getApplicationURI($conpherence->getID().'/'));
|
||||||
|
|
||||||
|
@ -373,7 +373,7 @@ final class ConpherenceUpdateController
|
||||||
$rendered_transactions = idx($data, 'transactions');
|
$rendered_transactions = idx($data, 'transactions');
|
||||||
$new_latest_transaction_id = idx($data, 'latest_transaction_id');
|
$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;
|
$nav_item = null;
|
||||||
$header = null;
|
$header = null;
|
||||||
$people_widget = null;
|
$people_widget = null;
|
||||||
|
|
|
@ -147,7 +147,7 @@ final class ConpherenceViewController extends
|
||||||
$draft = PhabricatorDraft::newFromUserAndKey(
|
$draft = PhabricatorDraft::newFromUserAndKey(
|
||||||
$user,
|
$user,
|
||||||
$conpherence->getPHID());
|
$conpherence->getPHID());
|
||||||
$update_uri = $this->getApplicationURI('update/'.$conpherence->getID().'/');
|
$update_uri = $this->getApplicationURI('edit/'.$conpherence->getID().'/');
|
||||||
|
|
||||||
if ($user->isLoggedIn()) {
|
if ($user->isLoggedIn()) {
|
||||||
$this->initBehavior('conpherence-pontificate');
|
$this->initBehavior('conpherence-pontificate');
|
||||||
|
|
|
@ -356,7 +356,7 @@ final class ConpherenceDurableColumnView extends AphrontTagView {
|
||||||
$actions[] = array(
|
$actions[] = array(
|
||||||
'name' => pht('Add Participants'),
|
'name' => pht('Add Participants'),
|
||||||
'disabled' => !$can_edit,
|
'disabled' => !$can_edit,
|
||||||
'href' => '/conpherence/update/'.$conpherence->getID().'/',
|
'href' => '/conpherence/edit/'.$conpherence->getID().'/',
|
||||||
'icon' => 'fa-plus',
|
'icon' => 'fa-plus',
|
||||||
'key' => ConpherenceUpdateActions::ADD_PERSON,
|
'key' => ConpherenceUpdateActions::ADD_PERSON,
|
||||||
);
|
);
|
||||||
|
@ -457,7 +457,7 @@ final class ConpherenceDurableColumnView extends AphrontTagView {
|
||||||
$this->getUser(),
|
$this->getUser(),
|
||||||
array(
|
array(
|
||||||
'method' => 'POST',
|
'method' => 'POST',
|
||||||
'action' => '/conpherence/update/'.$id.'/',
|
'action' => '/conpherence/edit/'.$id.'/',
|
||||||
'sigil' => 'conpherence-message-form',
|
'sigil' => 'conpherence-message-form',
|
||||||
),
|
),
|
||||||
array(
|
array(
|
||||||
|
|
|
@ -512,7 +512,7 @@ JX.install('ConpherenceThreadManager', {
|
||||||
},
|
},
|
||||||
|
|
||||||
_getUpdateURI: function() {
|
_getUpdateURI: function() {
|
||||||
return '/conpherence/update/' + this._loadedThreadID + '/';
|
return '/conpherence/edit/' + this._loadedThreadID + '/';
|
||||||
},
|
},
|
||||||
|
|
||||||
_getMoreMessagesURI: function() {
|
_getMoreMessagesURI: function() {
|
||||||
|
|
Loading…
Add table
Reference in a new issue