chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed - filter drh inside users list when you assign users into session - partial BT#570

Browse Source
skala
Cristian Fasanando 15 years ago
parent dd6f32cd3b
commit 699c9566ae
1 changed files with 20 additions and 20 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 40
      main/admin/add_users_to_session.php

40
main/admin/add_users_to_session.php
Unescape View File

@ -110,12 +110,12 @@ function search_users($needle,$type)
$sql = 'SELECT user_id, username, lastname, firstname FROM '.$tbl_user.' user $sql = 'SELECT user_id, username, lastname, firstname FROM '.$tbl_user.' user
WHERE (username LIKE "'.$needle.'%" WHERE (username LIKE "'.$needle.'%"
OR firstname LIKE "'.$needle.'%" OR firstname LIKE "'.$needle.'%"
OR lastname LIKE "'.$needle.'%") AND user_id<>"'.$user_anonymous.'"'. OR lastname LIKE "'.$needle.'%") AND user_id<>"'.$user_anonymous.'" AND user.status<>'.DRH.''.
$order_clause. $order_clause.
' LIMIT 11'; ' LIMIT 11';
} else { } else {
$sql = 'SELECT user_id, username, lastname, firstname FROM '.$tbl_user.' user $sql = 'SELECT user_id, username, lastname, firstname FROM '.$tbl_user.' user
WHERE '.(api_sort_by_first_name() ? 'firstname' : 'lastname').' LIKE "'.$needle.'%" AND user_id<>"'.$user_anonymous.'"'.$cond_user_id. WHERE '.(api_sort_by_first_name() ? 'firstname' : 'lastname').' LIKE "'.$needle.'%" AND user.status<>'.DRH.' AND user_id<>"'.$user_anonymous.'"'.$cond_user_id.
$order_clause; $order_clause;
} }
@ -129,14 +129,14 @@ function search_users($needle,$type)
INNER JOIN '.$tbl_user_rel_access_url.' url_user ON (url_user.user_id=user.user_id) INNER JOIN '.$tbl_user_rel_access_url.' url_user ON (url_user.user_id=user.user_id)
WHERE access_url_id = '.$access_url_id.' AND (username LIKE "'.$needle.'%" WHERE access_url_id = '.$access_url_id.' AND (username LIKE "'.$needle.'%"
OR firstname LIKE "'.$needle.'%" OR firstname LIKE "'.$needle.'%"
OR lastname LIKE "'.$needle.'%") AND user.user_id<>"'.$user_anonymous.'"'. OR lastname LIKE "'.$needle.'%") AND user.user_id<>"'.$user_anonymous.'" AND user.status<>'.DRH.' '.
$order_clause. $order_clause.
' LIMIT 11'; ' LIMIT 11';
} else { } else {
$sql = 'SELECT user.user_id, username, lastname, firstname FROM '.$tbl_user.' user $sql = 'SELECT user.user_id, username, lastname, firstname FROM '.$tbl_user.' user
INNER JOIN '.$tbl_user_rel_access_url.' url_user ON (url_user.user_id=user.user_id) INNER JOIN '.$tbl_user_rel_access_url.' url_user ON (url_user.user_id=user.user_id)
WHERE access_url_id = '.$access_url_id.' WHERE access_url_id = '.$access_url_id.'
AND '.(api_sort_by_first_name() ? 'firstname' : 'lastname').' LIKE "'.$needle.'%" AND user.user_id<>"'.$user_anonymous.'"'.$cond_user_id. AND '.(api_sort_by_first_name() ? 'firstname' : 'lastname').' LIKE "'.$needle.'%" AND user.status<>'.DRH.' AND user.user_id<>"'.$user_anonymous.'"'.$cond_user_id.
$order_clause; $order_clause;
} }
@ -274,9 +274,9 @@ if ($ajax_search) {
$sql="SELECT user_id, lastname, firstname, username, id_session $sql="SELECT user_id, lastname, firstname, username, id_session
FROM $tbl_user FROM $tbl_user
INNER JOIN $tbl_session_rel_user INNER JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = $tbl_user.user_id ON $tbl_session_rel_user.id_user = $tbl_user.user_id AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
AND $tbl_session_rel_user.id_session = ".intval($id_session). AND $tbl_session_rel_user.id_session = ".intval($id_session)."
$order_clause; WHERE status<>".DRH." $order_clause";
if ($_configuration['multiple_access_urls']==true) { if ($_configuration['multiple_access_urls']==true) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@ -285,10 +285,10 @@ if ($ajax_search) {
$sql="SELECT u.user_id, lastname, firstname, username, id_session $sql="SELECT u.user_id, lastname, firstname, username, id_session
FROM $tbl_user u FROM $tbl_user u
INNER JOIN $tbl_session_rel_user INNER JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = u.user_id ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
AND $tbl_session_rel_user.id_session = ".intval($id_session)." AND $tbl_session_rel_user.id_session = ".intval($id_session)."
INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=u.user_id) INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=u.user_id)
WHERE access_url_id = $access_url_id WHERE access_url_id = $access_url_id AND u.status<>".DRH."
$order_clause"; $order_clause";
} }
} }
@ -349,15 +349,16 @@ if ($ajax_search) {
$sql="SELECT user_id, lastname, firstname, username, id_session $sql="SELECT user_id, lastname, firstname, username, id_session
FROM $tbl_user u FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user LEFT JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = u.user_id AND id_session = '$id_session' ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.id_session = '$id_session' AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
$where_filter $where_filter AND u.status<>".DRH."
$order_clause"; $order_clause";
} else { } else {
$sql="SELECT user_id, lastname, firstname, username, id_session $sql="SELECT user_id, lastname, firstname, username, id_session
FROM $tbl_user u FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user LEFT JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = u.user_id AND id_session = '$id_session' ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.id_session = '$id_session' AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
WHERE u.status<>".DRH."
$order_clause"; $order_clause";
} }
if ($_configuration['multiple_access_urls']==true) { if ($_configuration['multiple_access_urls']==true) {
@ -367,9 +368,9 @@ if ($ajax_search) {
$sql="SELECT u.user_id, lastname, firstname, username, id_session $sql="SELECT u.user_id, lastname, firstname, username, id_session
FROM $tbl_user u FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user LEFT JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = u.user_id AND id_session = '$id_session' ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.id_session = '$id_session' AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=u.user_id) INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=u.user_id)
WHERE access_url_id = $access_url_id $where_filter WHERE access_url_id = $access_url_id $where_filter AND u.status<>".DRH."
$order_clause"; $order_clause";
} }
} }
@ -391,8 +392,8 @@ if ($ajax_search) {
$sql="SELECT user_id, lastname, firstname, username, id_session $sql="SELECT user_id, lastname, firstname, username, id_session
FROM $tbl_user u FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user LEFT JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = u.user_id AND id_session = '$id_session' ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.id_session = '$id_session' AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
$order_clause"; WHERE u.status<>".DRH." $order_clause";
if ($_configuration['multiple_access_urls']==true) { if ($_configuration['multiple_access_urls']==true) {
$tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER); $tbl_user_rel_access_url= Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
@ -401,9 +402,9 @@ if ($ajax_search) {
$sql="SELECT u.user_id, lastname, firstname, username, id_session $sql="SELECT u.user_id, lastname, firstname, username, id_session
FROM $tbl_user u FROM $tbl_user u
LEFT JOIN $tbl_session_rel_user LEFT JOIN $tbl_session_rel_user
ON $tbl_session_rel_user.id_user = u.user_id AND id_session = '$id_session' ON $tbl_session_rel_user.id_user = u.user_id AND $tbl_session_rel_user.id_session = '$id_session' AND $tbl_session_rel_user.relation_type<>".SESSION_RELATION_TYPE_RRHH."
INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=u.user_id) INNER JOIN $tbl_user_rel_access_url url_user ON (url_user.user_id=u.user_id)
WHERE access_url_id = $access_url_id WHERE access_url_id = $access_url_id AND u.status<>".DRH."
$order_clause"; $order_clause";
} }
} }
@ -422,8 +423,7 @@ if ($ajax_search) {
if (array_key_exists($user['user_id'],$nosessionUsersList)) if (array_key_exists($user['user_id'],$nosessionUsersList))
unset($nosessionUsersList[$user['user_id']]); unset($nosessionUsersList[$user['user_id']]);
} }
/* else if ( $sessionUsersList[$user['user_id']]['id_session']!=$id_session )
$nosessionUsersList[$user['user_id']] = $user ;*/
} }
} }

Write Preview
Loading…
Cancel
Save