GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Some UI improvements for blocking and unblocking

Browse Source 
Add unblock to the router table, so unblocking will work at all.

Block form and unblock form return to subscribers list, not
subscriptions list, by default.

showstream action sends its parameters to block and unblock forms to
better return to the right page.
This commit is contained in:
Evan Prodromou 2009-06-14 15:54:22 -07:00
parent 1c41afbd36
commit 203a5aba67
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/block.php
View File

@ -180,7 +180,7 @@ class BlockAction extends Action
if ($action) { if ($action) {
common_redirect(common_local_url($action, $args), 303); common_redirect(common_local_url($action, $args), 303);
} else { } else {
common_redirect(common_local_url('subscriptions', common_redirect(common_local_url('subscribers',
array('nickname' => $cur->nickname)), array('nickname' => $cur->nickname)),
303); 303);
} }

8
actions/showstream.php
View File

@ -308,10 +308,14 @@ class ShowstreamAction extends ProfileAction
$blocked = $cur->hasBlocked($this->profile); $blocked = $cur->hasBlocked($this->profile);
$this->elementStart('li', 'entity_block'); $this->elementStart('li', 'entity_block');
if ($blocked) { if ($blocked) {
$ubf = new UnblockForm($this, $this->profile); $ubf = new UnblockForm($this, $this->profile,
array('action' => 'showstream',
'nickname' => $this->profile->nickname));
$ubf->show(); $ubf->show();
} else { } else {
$bf = new BlockForm($this, $this->profile); $bf = new BlockForm($this, $this->profile,
array('action' => 'showstream',
'nickname' => $this->profile->nickname));
$bf->show(); $bf->show();
} }
$this->elementEnd('li'); $this->elementEnd('li');

2
actions/unblock.php
View File

@ -118,7 +118,7 @@ class UnblockAction extends Action
if ($action) { if ($action) {
common_redirect(common_local_url($action, $args), 303); common_redirect(common_local_url($action, $args), 303);
} else { } else {
common_redirect(common_local_url('subscriptions', common_redirect(common_local_url('subscribers',
array('nickname' => $cur->nickname)), array('nickname' => $cur->nickname)),
303); 303);
} }

2
lib/router.php
View File

@ -101,7 +101,7 @@ class Router
$main = array('login', 'logout', 'register', 'subscribe', $main = array('login', 'logout', 'register', 'subscribe',
'unsubscribe', 'confirmaddress', 'recoverpassword', 'unsubscribe', 'confirmaddress', 'recoverpassword',
'invite', 'favor', 'disfavor', 'sup', 'invite', 'favor', 'disfavor', 'sup',
'block', 'subedit'); 'block', 'unblock', 'subedit');
foreach ($main as $a) { foreach ($main as $a) {
$m->connect('main/'.$a, array('action' => $a)); $m->connect('main/'.$a, array('action' => $a));