dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New Devices permissions profile select and edit. (#6821) 

* Device select permissions

* Apply device select permissions.

* Fix missing index

Fix missing index
This commit is contained in:
volga629-1 2023-11-01 20:33:13 -04:00 committed by GitHub
parent ac1cb868b8
commit 8ed5dd4c76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/devices/app_config.php
View File

@ -301,6 +301,14 @@
$apps[$x]['permissions'][$y]['name'] = "device_profile_domain"; $apps[$x]['permissions'][$y]['name'] = "device_profile_domain";
$apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin";
$y++; $y++;
$apps[$x]['permissions'][$y]['name'] = 'device_profile_select';
$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
$apps[$x]['permissions'][$y]['groups'][] = "admin";
$y++;
$apps[$x]['permissions'][$y]['name'] = 'device_profile_select_edit';
$apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
$apps[$x]['permissions'][$y]['groups'][] = "admin";
$y++;
$apps[$x]['permissions'][$y]['name'] = 'device_profile_key_view'; $apps[$x]['permissions'][$y]['name'] = 'device_profile_key_view';
$apps[$x]['permissions'][$y]['groups'][] = 'superadmin'; $apps[$x]['permissions'][$y]['groups'][] = 'superadmin';
$apps[$x]['permissions'][$y]['groups'][] = "admin"; $apps[$x]['permissions'][$y]['groups'][] = "admin";
@ -4195,4 +4203,4 @@
$vendors[$y]['name'] = "sipnetic"; $vendors[$y]['name'] = "sipnetic";
$z=0; $z=0;
?> ?>

56
app/devices/device_edit.php
View File

@ -1406,32 +1406,36 @@
echo " </tr>"; echo " </tr>";
} }
if (permission_exists('device_profile_edit')) { if (permission_exists('device_profile_edit')) {
//device profile //device profile
$sql = "select * from v_device_profiles "; $sql = "select * from v_device_profiles ";
$sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) "; $sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) ";
$sql .= "order by device_profile_name asc "; $sql .= "order by device_profile_name asc ";
$parameters['domain_uuid'] = $domain_uuid; $parameters['domain_uuid'] = $domain_uuid;
$database = new database; $database = new database;
$result = $database->select($sql, $parameters, 'all'); $result = $database->select($sql, $parameters, 'all');
if (is_array($result) && @sizeof($result) != 0) { if (is_array($result) && @sizeof($result) != 0) {
echo " <tr>"; if (permission_exists('device_profile_select')) {
echo " <td class='vncell' valign='top'>".$text['label-profile']."</td>"; echo " <tr>";
echo " <td class='vtable' align='left'>"; echo " <td class='vncell' valign='top'>".$text['label-profile']."</td>";
echo " <select class='formfld' id='device_profile_uuid' name='device_profile_uuid'>\n"; echo " <td class='vtable' align='left'>";
echo " <option value=''></option>\n"; echo " <select class='formfld' id='device_profile_uuid' name='device_profile_uuid'>\n";
foreach($result as $row) { echo " <option value=''></option>\n";
echo " <option value='".escape($row['device_profile_uuid'])."' ".(!empty($device_profile_uuid) && $row['device_profile_uuid'] == $device_profile_uuid ? "selected='selected'" : null).">".escape($row['device_profile_name'])." ".(($row['domain_uuid'] == '') ? "&nbsp;&nbsp;(".$text['select-global'].")" : null)."</option>\n"; foreach($result as $row) {
} echo " <option value='".escape($row['device_profile_uuid'])."' ".(!empty($device_profile_uuid) && $row['device_profile_uuid'] == $device_profile_uuid ? "selected='selected'" : null).">".escape($row['device_profile_name'])." ".(($row['domain_uuid'] == '') ? "&nbsp;&nbsp;(".$text['select-global'].")" : null)."</option>\n";
echo " </select>\n"; }
echo " <button type='button' class='btn btn-default list_control_icon' id='device_profile_edit' onclick=\"if($('#device_profile_uuid').val() != '') window.location='device_profile_edit.php?id='+$('#device_profile_uuid').val();\"><span class='fas fa-pencil-alt'></span></button>"; echo " </select>\n";
echo " <button type='button' class='btn btn-default list_control_icon' onclick=\"window.location='device_profile_edit.php'\"><span class='fas fa-plus'></span></button>"; }
echo " <br>".$text['description-profile2']."\n"; if (permission_exists('device_profile_select_edit')) {
echo " </td>"; echo "<button type='button' class='btn btn-default list_control_icon' id='device_profile_edit' onclick=\"if($('#device_profile_uuid').val() != '') window.location='device_profile_edit.php?id='+$('#device_profile_uuid').val();\"><span class='fas fa-pencil-alt'></span></button>";
echo " </tr>"; echo " <button type='button' class='btn btn-default list_control_icon' onclick=\"window.location='device_profile_edit.php'\"><span class='fas fa-plus'></span></button>";
} echo " <br>".$text['description-profile2']."\n";
unset($sql, $parameters, $result); }
} echo " </td>";
echo " </tr>";
}
unset($sql, $parameters, $result);
}
if (permission_exists('device_key_edit')) { if (permission_exists('device_key_edit')) {