wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[UI] Fix group member pages showing up twice

Browse Source
This commit is contained in:
Alexei Sorokin 2020-05-05 16:49:21 +03:00 committed by Diogo Peralta Cordeiro
parent 26622cb84b
commit aa2f09fa3c
1 changed files with 50 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
actions/groupmembers.php
View File

@ -1,82 +1,79 @@
<?php <?php
// This file is part of GNU social - https://www.gnu.org/software/social
//
// GNU social is free software: you can redistribute it and/or modify
// it under the terms of the GNU Affero General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// GNU social is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Affero General Public License for more details.
//
// You should have received a copy of the GNU Affero General Public License
// along with GNU social. If not, see <http://www.gnu.org/licenses/>.
/** /**
* StatusNet, the distributed open-source microblogging tool
*
* List of group members * List of group members
* *
* PHP version 5
*
* LICENCE: This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @category Group * @category Group
* @package StatusNet * @package GNUsocial
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @copyright 2008-2009 StatusNet, Inc. * @copyright 2008-2009 StatusNet, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
if (!defined('GNUSOCIAL')) { exit(1); } defined('GNUSOCIAL') || die();
/** /**
* List of group members * List of group members
* *
* @category Group * @category Group
* @package StatusNet * @package GNUsocial
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @license https://www.gnu.org/licenses/agpl.html GNU AGPL v3 or later
* @link http://status.net/
*/ */
class GroupmembersAction extends GroupAction class GroupmembersAction extends GroupAction
{ {
var $page = null; public $page = null;
function isReadOnly($args) public function isReadOnly($args)
{ {
return true; return true;
} }
function title() public function title()
{ {
if ($this->page == 1) { if ($this->page == 1) {
// TRANS: Title of the page showing group members. // TRANS: Title of the page showing group members.
// TRANS: %s is the name of the group. // TRANS: %s is the name of the group.
return sprintf(_('%s group members'), return sprintf(
$this->group->nickname); _('%s group members'),
$this->group->nickname
);
} else { } else {
// TRANS: Title of the page showing group members. // TRANS: Title of the page showing group members.
// TRANS: %1$s is the name of the group, %2$d is the page number of the members list. // TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
return sprintf(_('%1$s group members, page %2$d'), return sprintf(
_('%1$s group members, page %2$d'),
$this->group->nickname, $this->group->nickname,
$this->page); $this->page
);
} }
} }
protected function handle() public function showPageNotice()
{ {
parent::handle(); $this->element(
$this->showPage(); 'p',
} 'instructions',
function showPageNotice()
{
$this->element('p', 'instructions',
// TRANS: Page notice for group members page. // TRANS: Page notice for group members page.
_('A list of the users in this group.')); _('A list of the users in this group.')
);
} }
function showContent() public function showContent()
{ {
$offset = ($this->page-1) * PROFILES_PER_PAGE; $offset = ($this->page-1) * PROFILES_PER_PAGE;
$limit = PROFILES_PER_PAGE + 1; $limit = PROFILES_PER_PAGE + 1;
@ -90,8 +87,12 @@ class GroupmembersAction extends GroupAction
$cnt = $member_list->show(); $cnt = $member_list->show();
} }
$this->pagination($this->page > 1, $cnt > PROFILES_PER_PAGE, $this->pagination(
$this->page, 'groupmembers', $this->page > 1,
array('nickname' => $this->group->nickname)); $cnt > PROFILES_PER_PAGE,
$this->page,
'groupmembers',
['nickname' => $this->group->nickname]
);
} }
} }