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
9ec94101
Commit
9ec94101
authored
Feb 15, 2008
by
Clare Lenihan
Committed by
Clare Lenihan
Feb 15, 2008
Browse files
changing char to varchar for group relationships
fixes bug where group relationships aren't detected properly
parent
8a5331aa
Changes
2
Hide whitespace changes
Inline
Side-by-side
htdocs/group/find.php
View file @
9ec94101
...
@@ -96,17 +96,17 @@ if ($groups['data']) {
...
@@ -96,17 +96,17 @@ if ($groups['data']) {
LEFT JOIN {group_member} gm ON (gm.group = g.id)
LEFT JOIN {group_member} gm ON (gm.group = g.id)
LEFT JOIN {group_member_request} gmr ON (gmr.group = g.id)
LEFT JOIN {group_member_request} gmr ON (gmr.group = g.id)
LEFT JOIN (
LEFT JOIN (
SELECT g.id, CAST(\'owner\' AS CHAR(7)) AS type
SELECT g.id, CAST(\'owner\' AS
VAR
CHAR(7)) AS type
FROM {group} g
FROM {group} g
WHERE g.owner = ?
WHERE g.owner = ?
UNION SELECT g.id, CAST(\'member\' AS CHAR(7)) AS type
UNION SELECT g.id, CAST(\'member\' AS
VAR
CHAR(7)) AS type
FROM {group} g
FROM {group} g
INNER JOIN {group_member} gm ON (g.id = gm.group AND gm.member = ?)
INNER JOIN {group_member} gm ON (g.id = gm.group AND gm.member = ?)
WHERE g.owner != gm.member
WHERE g.owner != gm.member
UNION SELECT g.id, CAST(\'invite\' AS CHAR(7)) AS type
UNION SELECT g.id, CAST(\'invite\' AS
VAR
CHAR(7)) AS type
FROM {group} g
FROM {group} g
INNER JOIN {group_member_invite} gmi ON (gmi.group = g.id AND gmi.member = ?)
INNER JOIN {group_member_invite} gmi ON (gmi.group = g.id AND gmi.member = ?)
UNION SELECT g.id, CAST(\'request\' AS CHAR(7)) AS type
UNION SELECT g.id, CAST(\'request\' AS
VAR
CHAR(7)) AS type
FROM {group} g
FROM {group} g
INNER JOIN {group_member_request} gmr ON (gmr.group = g.id AND gmr.member = ?)
INNER JOIN {group_member_request} gmr ON (gmr.group = g.id AND gmr.member = ?)
) t ON t.id = g.id
) t ON t.id = g.id
...
...
htdocs/group/mygroups.php
View file @
9ec94101
...
@@ -43,7 +43,7 @@ $offset = (int)($offset / $groupsperpage) * $groupsperpage;
...
@@ -43,7 +43,7 @@ $offset = (int)($offset / $groupsperpage) * $groupsperpage;
if
(
$filter
==
'owner'
)
{
if
(
$filter
==
'owner'
)
{
$sql
=
'
$sql
=
'
INNER JOIN (
INNER JOIN (
SELECT g.id, CAST(\'owner\' AS CHAR(7)) AS type
SELECT g.id, CAST(\'owner\' AS
VAR
CHAR(7)) AS type
FROM {group} g
FROM {group} g
WHERE g.owner = ?
WHERE g.owner = ?
) t ON t.id = g.id'
;
) t ON t.id = g.id'
;
...
@@ -52,10 +52,10 @@ if ($filter == 'owner') {
...
@@ -52,10 +52,10 @@ if ($filter == 'owner') {
else
if
(
$filter
==
'member'
)
{
else
if
(
$filter
==
'member'
)
{
$sql
=
'
$sql
=
'
INNER JOIN (
INNER JOIN (
SELECT g.id, CAST(\'owner\' AS CHAR(7)) AS type
SELECT g.id, CAST(\'owner\' AS
VAR
CHAR(7)) AS type
FROM {group} g
FROM {group} g
WHERE g.owner = ?
WHERE g.owner = ?
UNION SELECT g.id, CAST(\'member\' AS CHAR(7)) AS type
UNION SELECT g.id, CAST(\'member\' AS
VAR
CHAR(7)) AS type
FROM {group} g
FROM {group} g
INNER JOIN {group_member} gm ON (g.id = gm.group AND gm.member = ?)
INNER JOIN {group_member} gm ON (g.id = gm.group AND gm.member = ?)
WHERE g.owner != gm.member
WHERE g.owner != gm.member
...
@@ -65,7 +65,7 @@ else if ($filter == 'member') {
...
@@ -65,7 +65,7 @@ else if ($filter == 'member') {
else
if
(
$filter
==
'invite'
)
{
else
if
(
$filter
==
'invite'
)
{
$sql
=
'
$sql
=
'
INNER JOIN (
INNER JOIN (
SELECT g.id, CAST(\'invite\' AS CHAR(7)) AS type
SELECT g.id, CAST(\'invite\' AS
VAR
CHAR(7)) AS type
FROM {group} g
FROM {group} g
INNER JOIN {group_member_invite} gmi ON (gmi.group = g.id AND gmi.member = ?)
INNER JOIN {group_member_invite} gmi ON (gmi.group = g.id AND gmi.member = ?)
) t ON t.id = g.id'
;
) t ON t.id = g.id'
;
...
@@ -74,7 +74,7 @@ else if ($filter == 'invite') {
...
@@ -74,7 +74,7 @@ else if ($filter == 'invite') {
else
if
(
$filter
==
'request'
)
{
else
if
(
$filter
==
'request'
)
{
$sql
=
'
$sql
=
'
INNER JOIN (
INNER JOIN (
SELECT g.id, CAST(\'request\' AS CHAR(7)) AS type
SELECT g.id, CAST(\'request\' AS
VAR
CHAR(7)) AS type
FROM {group} g
FROM {group} g
INNER JOIN {group_member_request} gmr ON (gmr.group = g.id AND gmr.member = ?)
INNER JOIN {group_member_request} gmr ON (gmr.group = g.id AND gmr.member = ?)
) t ON t.id = g.id'
;
) t ON t.id = g.id'
;
...
@@ -84,17 +84,17 @@ else { // all or some other text
...
@@ -84,17 +84,17 @@ else { // all or some other text
$filter
=
'all'
;
$filter
=
'all'
;
$sql
=
'
$sql
=
'
INNER JOIN (
INNER JOIN (
SELECT g.id, CAST(\'owner\' AS CHAR(7)) AS type
SELECT g.id, CAST(\'owner\' AS
VAR
CHAR(7)) AS type
FROM {group} g
FROM {group} g
WHERE g.owner = ?
WHERE g.owner = ?
UNION SELECT g.id, CAST(\'member\' AS CHAR(7)) AS type
UNION SELECT g.id, CAST(\'member\' AS
VAR
CHAR(7)) AS type
FROM {group} g
FROM {group} g
INNER JOIN {group_member} gm ON (g.id = gm.group AND gm.member = ?)
INNER JOIN {group_member} gm ON (g.id = gm.group AND gm.member = ?)
WHERE g.owner != gm.member
WHERE g.owner != gm.member
UNION SELECT g.id, CAST(\'invite\' AS CHAR(7)) AS type
UNION SELECT g.id, CAST(\'invite\' AS
VAR
CHAR(7)) AS type
FROM {group} g
FROM {group} g
INNER JOIN {group_member_invite} gmi ON (gmi.group = g.id AND gmi.member = ?)
INNER JOIN {group_member_invite} gmi ON (gmi.group = g.id AND gmi.member = ?)
UNION SELECT g.id, CAST(\'request\' AS CHAR(7)) AS type
UNION SELECT g.id, CAST(\'request\' AS
VAR
CHAR(7)) AS type
FROM {group} g
FROM {group} g
INNER JOIN {group_member_request} gmr ON (gmr.group = g.id AND gmr.member = ?)
INNER JOIN {group_member_request} gmr ON (gmr.group = g.id AND gmr.member = ?)
) t ON t.id = g.id'
;
) t ON t.id = g.id'
;
...
...
Write
Preview
Markdown
is supported
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