tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-28 00:04:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dashboards-in-home-page-dev' into 'develop'

Browse Source 
Added dashboards to "edit my user" section

See merge request !391
This commit is contained in:
vgilc 2017-05-17 17:20:29 +02:00
commit 3118a70f66
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pandora_console/include/functions.php
View File

@ -1990,9 +1990,32 @@ function get_os_name ($id_os) {
* @return array Dashboard name of the given user. * @return array Dashboard name of the given user.
*/ */
function get_user_dashboards ($id_user) { function get_user_dashboards ($id_user) {
$sql = "SELECT name if (users_is_admin($id_user)) {
FROM tdashboard $sql = "SELECT name
WHERE id_user="."'".$id_user."'"; FROM tdashboard WHERE id_user = '" . $id_user ."' OR id_user = ''";
}
else {
$user_can_manage_all = users_can_manage_group_all('RR');
if ($user_can_manage_all) {
$sql = "SELECT name
FROM tdashboard WHERE id_user = '" . $id_user ."' OR id_user = ''";
}
else {
$user_groups = users_get_groups($id_user, "RR", false);
if (empty($user_groups)) {
return false;
}
$u_groups = array();
foreach ($user_groups as $id => $group_name) {
$u_groups[] = $id;
}
$sql = "SELECT name
FROM tdashboard
WHERE id_group IN (" . implode(",", $u_groups) . ") AND (id_user = '" . $id_user ."' OR id_user = '')";
}
}
return db_get_all_rows_sql ($sql); return db_get_all_rows_sql ($sql);
} }

1
pandora_console/operation/users/user_edit.php
View File

@ -288,6 +288,7 @@ if (!$meta) {
if (enterprise_installed()) { if (enterprise_installed()) {
$dashboards = get_user_dashboards ($config['id_user']); $dashboards = get_user_dashboards ($config['id_user']);
$dashboards_aux = array(); $dashboards_aux = array();
if ($dashboards === false) { if ($dashboards === false) {
$dashboards = array('None'=>'None'); $dashboards = array('None'=>'None');