Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
3ae1c917
Commit
3ae1c917
authored
Nov 26, 2007
by
Nigel McNie
Browse files
I18n-ise 'tutor' and 'member' on user/view.php when seeing what groups the user is in.
Fixes bug #1332.
parent
8b7717ce
Changes
2
Hide whitespace changes
Inline
Side-by-side
htdocs/lib/group.php
View file @
3ae1c917
...
@@ -161,10 +161,13 @@ function get_associated_groups($userid=0) {
...
@@ -161,10 +161,13 @@ function get_associated_groups($userid=0) {
FROM
{
group_member_request
}
gm WHERE gm.member = ?
FROM
{
group_member_request
}
gm WHERE gm.member = ?
UNION
UNION
SELECT gm.group, 'member' AS type
SELECT gm.group, 'member' AS type
FROM
{
group_member
}
gm WHERE gm.member = ?
FROM
{
group_member
}
gm WHERE gm.member = ? AND gm.tutor = 0
UNION
SELECT gm.group, 'tutor' AS type
FROM
{
group_member
}
gm WHERE gm.member = ? AND gm.tutor = 1
) AS a ON a.group = g.id"
;
) AS a ON a.group = g.id"
;
return
get_records_sql_assoc
(
$sql
,
array
(
$userid
,
$userid
,
$userid
));
return
get_records_sql_assoc
(
$sql
,
array
(
$userid
,
$userid
,
$userid
,
$userid
));
}
}
...
...
htdocs/theme/default/templates/user/view.tpl
View file @
3ae1c917
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
</td></tr></thead>
</td></tr></thead>
<tbody>
<tbody>
{
foreach
from
=
$USERGROUPS
item
=
item
}
{
foreach
from
=
$USERGROUPS
item
=
item
}
<tr><td><a
href=
"
{
$WWWROOT
}
group/view.php?id=
{
$item
->
id
}
"
>
{
$item
->
name
|
escape
}
</a></td><td>
{
$item
->
type
|
escape
}
</td></tr>
<tr><td><a
href=
"
{
$WWWROOT
}
group/view.php?id=
{
$item
->
id
}
"
>
{
$item
->
name
|
escape
}
</a></td><td>
{
str
tag
=
$item
->
type
}
</td></tr>
{/
foreach
}
{/
foreach
}
</tbody></table>
</tbody></table>
{/
if
}
{/
if
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment