Commit 483922f1 authored by Evan Prodromou's avatar Evan Prodromou

Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

parents bd11d11b 2707a481
......@@ -119,6 +119,15 @@ class ApprovegroupAction extends Action
if (empty($this->request)) {
$this->clientError(sprintf(_('%s is not in the moderation queue for this group.'), $this->profile->nickname), 403);
}
$this->approve = (bool)$this->arg('approve');
$this->cancel = (bool)$this->arg('cancel');
if (!$this->approve && !$this->cancel) {
$this->clientError(_('Internal error: received neither cancel nor abort.'));
}
if ($this->approve && $this->cancel) {
$this->clientError(_('Internal error: received both cancel and abort.'));
}
return true;
}
......@@ -136,7 +145,11 @@ class ApprovegroupAction extends Action
parent::handle($args);
try {
$this->profile->completeJoinGroup($this->group);
if ($this->approve) {
$this->profile->completeJoinGroup($this->group);
} elseif ($this->cancel) {
$this->profile->cancelJoinGroup($this->group);
}
} catch (Exception $e) {
common_log(LOG_ERROR, "Exception canceling group sub: " . $e->getMessage());
// TRANS: Server error displayed when cancelling a queued group join request fails.
......@@ -149,14 +162,17 @@ class ApprovegroupAction extends Action
if ($this->boolean('ajax')) {
$this->startHTML('text/xml;charset=utf-8');
$this->elementStart('head');
// TRANS: Title for leave group page after leaving.
$this->element('title', null, sprintf(_m('TITLE','%1$s left group %2$s'),
// TRANS: Title for leave group page after group join request is approved/disapproved.
$this->element('title', null, sprintf(_m('TITLE','%1$s\'s request for %2$s'),
$this->profile->nickname,
$this->group->nickname));
$this->elementEnd('head');
$this->elementStart('body');
$jf = new JoinForm($this, $this->group);
$jf->show();
if ($this->approve) {
$this->element('p', 'success', _m('Join request approved.'));
} elseif ($this->cancel) {
$this->element('p', 'success', _m('Join request canceled.'));
}
$this->elementEnd('body');
$this->elementEnd('html');
} else {
......
......@@ -174,26 +174,17 @@ class GroupQueueListItem extends GroupMemberListItem
{
$this->startActions();
if (Event::handle('StartProfileListItemActionElements', array($this))) {
$this->showApproveButton();
$this->showCancelButton();
$this->showApproveButtons();
Event::handle('EndProfileListItemActionElements', array($this));
}
$this->endActions();
}
function showApproveButton()
function showApproveButtons()
{
$this->out->elementStart('li', 'entity_join');
$this->out->elementStart('li', 'entity_approval');
$form = new ApproveGroupForm($this->out, $this->group, $this->profile);
$form->show();
$this->out->elementEnd('li');
}
function showCancelButton()
{
$this->out->elementStart('li', 'entity_leave');
$bf = new CancelGroupForm($this->out, $this->group, $this->profile);
$bf->show();
$this->out->elementEnd('li');
}
}
......@@ -1464,6 +1464,18 @@ var SN = { // StatusNet
SN.U.FormXHR($(this));
return false;
});
$('form.ajax input[type=submit]').live('click', function() {
// Some forms rely on knowing which submit button was clicked.
// Save a hidden input field which'll be picked up during AJAX
// submit...
var button = $(this);
var form = button.closest('form');
form.find('.hidden-submit-button').remove();
$('<input class="hidden-submit-button" type="hidden" />')
.attr('name', button.attr('name'))
.val(button.val())
.appendTo(form);
});
},
/**
......
This diff is collapsed.
......@@ -79,7 +79,7 @@ class ApproveGroupForm extends Form
function id()
{
return 'group-cancel-' . $this->group->id;
return 'group-queue-' . $this->group->id;
}
/**
......@@ -90,7 +90,7 @@ class ApproveGroupForm extends Form
function formClass()
{
return 'form_group_join ajax';
return 'form_group_queue ajax';
}
/**
......@@ -117,6 +117,7 @@ class ApproveGroupForm extends Form
function formActions()
{
$this->out->submit('submit', _('Approve'));
$this->out->submit('approve', _('Accept'));
$this->out->submit('cancel', _('Reject'));
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment