Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[ticket/510] Order groups by group_legend setting in leaders module #517

Merged
merged 1 commit into from
Mar 21, 2015
Merged

[ticket/510] Order groups by group_legend setting in leaders module #517

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions modules/leaders.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ public function get_template_side($module_id)
{
// Display a listing of board admins, moderators
$this->user->add_lang('groups');
$order_legend = ($this->config['legend_sort_groupname']) ? 'group_name' : 'group_legend';

if($this->config['board3_leaders_ext_' . $module_id])
{
Expand All @@ -99,14 +100,14 @@ public function get_template_side($module_id)

if ($this->auth->acl_gets('a_group', 'a_groupadd', 'a_groupdel'))
{
$sql = 'SELECT group_id, group_name, group_colour, group_type
$sql = 'SELECT group_id, group_name, group_colour, group_type, group_legend
FROM ' . GROUPS_TABLE . '
WHERE group_legend >= 1
ORDER BY group_name ASC';
ORDER BY ' . $order_legend . ' ASC';
}
else
{
$sql = 'SELECT g.group_id, g.group_name, g.group_colour, g.group_type
$sql = 'SELECT g.group_id, g.group_name, g.group_colour, g.group_type, g.group_legend
FROM ' . GROUPS_TABLE . ' g
LEFT JOIN ' . USER_GROUP_TABLE . ' ug
ON (
Expand All @@ -116,7 +117,7 @@ public function get_template_side($module_id)
)
WHERE g.group_legend >= 1
AND (g.group_type <> ' . GROUP_HIDDEN . ' OR ug.user_id = ' . $this->user->data['user_id'] . ')
ORDER BY g.group_name ASC';
ORDER BY g.' . $order_legend . ' ASC';
}
$result = $this->db->sql_query($sql, 600);

Expand Down Expand Up @@ -187,7 +188,7 @@ public function get_template_side($module_id)
else
{
$sql = $this->db->sql_build_query('SELECT', array(
'SELECT' => 'u.user_id, u.group_id as default_group, u.username, u.user_colour, u.user_allow_pm, g.group_id, g.group_name, g.group_colour, g.group_type, ug.user_id as ug_user_id',
'SELECT' => 'u.user_id, u.group_id as default_group, u.username, u.user_colour, u.user_allow_pm, g.group_id, g.group_name, g.group_colour, g.group_type, g.group_legend, ug.user_id as ug_user_id',
'FROM' => array(
USERS_TABLE => 'u',
GROUPS_TABLE => 'g'
Expand All @@ -198,7 +199,7 @@ public function get_template_side($module_id)
'ON' => 'ug.group_id = g.group_id AND ug.user_pending = 0 AND ug.user_id = ' . $this->user->data['user_id']
)),
'WHERE' => 'u.group_id = g.group_id AND ' . $this->db->sql_in_set('g.group_name', array('ADMINISTRATORS', 'GLOBAL_MODERATORS')),
'ORDER_BY' => 'g.group_name ASC, u.username_clean ASC'
'ORDER_BY' => 'g.' . $order_legend . ' ASC, u.username_clean ASC'
));

$result = $this->db->sql_query($sql, 600);
Expand Down