Page MenuHomePhabricator
Files F13263090

D15168.id36620.diff
No OneTemporary
Actions

D15168.id36620.diff
View Options

Index: src/applications/conpherence/controller/ConpherenceUpdateController.php
===================================================================
--- src/applications/conpherence/controller/ConpherenceUpdateController.php
+++ src/applications/conpherence/controller/ConpherenceUpdateController.php
@@ -16,11 +16,9 @@
switch ($action) {
case ConpherenceUpdateActions::REMOVE_PERSON:
$person_phid = $request->getStr('remove_person');
- // This condition and one below enforces the remove_person to be same as the acting_person
- // By default all we need is to check whether the acting_person can edit the room or not.
- // if ($person_phid != $user->getPHID()) {
+ if ($person_phid != $user->getPHID()) {
$needed_capabilities[] = PhabricatorPolicyCapability::CAN_EDIT;
- // }
+ }
break;
case ConpherenceUpdateActions::ADD_PERSON:
case ConpherenceUpdateActions::METADATA:
@@ -113,10 +111,7 @@
break;
}
$person_phid = $request->getStr('remove_person');
- // Even though we are no longer checking for the user to be himself,
- // it is still necessary for the phid of the user to be specified
- if ($person_phid) {
- // if ($person_phid && $person_phid == $user->getPHID()) {
+ if ($person_phid && $person_phid == $user->getPHID()) {
$xactions[] = id(new ConpherenceTransaction())
->setTransactionType(
ConpherenceTransaction::TYPE_PARTICIPANTS)
Index: src/applications/conpherence/view/ConpherencePeopleWidgetView.php
===================================================================
--- src/applications/conpherence/view/ConpherencePeopleWidgetView.php
+++ src/applications/conpherence/view/ConpherencePeopleWidgetView.php
@@ -21,8 +21,7 @@
foreach ($handles as $handle) {
$user_phid = $handle->getPHID();
$remove_html = '';
- // Add the 'remove' icon next to all users. The actual validation will be handled in ConpherenceUpdateController instead.
- // if ($user_phid == $user->getPHID()) {
+ if ($user_phid == $user->getPHID()) {
$icon = id(new PHUIIconView())
->setIcon('fa-times lightbluetext');
$remove_html = javelin_tag(
@@ -36,7 +35,7 @@
),
),
$icon);
- // }
+ }
$body[] = phutil_tag(
'div',
array(

File Metadata

Mime Type
text/plain
Expires
Tue, May 28, 7:17 AM (4 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6309841
Default Alt Text
D15168.id36620.diff (2 KB)

Event Timeline

Phabricator · Built by Phacility