git.gnu.io has moved to IP address 209.51.188.249 -- please double check where you are logging in.

Commit 636455ad authored by Evan Prodromou's avatar Evan Prodromou

Fix conflict between URL parameter and POST parameter with groups

Group edit page is at /group/:nickname/edit. There's also a form
parameter named 'nickname'. The two were conflicting.

I changed the form parameter to 'newnickname' and it works.

I'm not sure how this ever worked before, though.
parent 794dea48
......@@ -159,7 +159,7 @@ class EditgroupAction extends GroupAction
function showScripts()
{
parent::showScripts();
$this->autofocus('nickname');
$this->autofocus('newnickname');
}
function trySave()
......@@ -173,7 +173,7 @@ class EditgroupAction extends GroupAction
if (Event::handle('StartGroupSaveForm', array($this))) {
$nickname = Nickname::normalize($this->trimmed('nickname'));
$nickname = Nickname::normalize($this->trimmed('newnickname'));
$fullname = $this->trimmed('fullname');
$homepage = $this->trimmed('homepage');
$description = $this->trimmed('description');
......
......@@ -122,7 +122,7 @@ class NewgroupAction extends Action
{
if (Event::handle('StartGroupSaveForm', array($this))) {
try {
$nickname = Nickname::normalize($this->trimmed('nickname'));
$nickname = Nickname::normalize($this->trimmed('newnickname'));
} catch (NicknameException $e) {
$this->showForm($e->getMessage());
}
......
......@@ -144,8 +144,8 @@ class GroupEditForm extends Form
$this->out->elementStart('li');
$this->out->hidden('groupid', $id);
// TRANS: Field label on group edit form.
$this->out->input('nickname', _('Nickname'),
($this->out->arg('nickname')) ? $this->out->arg('nickname') : $nickname,
$this->out->input('newnickname', _('Nickname'),
($this->out->arg('newnickname')) ? $this->out->arg('newnickname') : $nickname,
// TRANS: Field title on group edit form.
_('1-64 lowercase letters or numbers, no punctuation or spaces.'));
$this->out->elementEnd('li');
......
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