frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2023-10-10 13:36:59 +02:00
Code Issues Releases Wiki Activity

ws281x - Update logic to identify is user is admin (#1623)

Browse Source
This commit is contained in:
LordGrey 2023-08-03 22:40:25 +02:00 committed by GitHub
parent c0dc08b0c0
commit d1879c2e39
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/webconfig/js/content_leds.js
View File

@ -2069,7 +2069,7 @@ var updateOutputSelectList = function (ledType, discoveryInfo) {
case "devRPiPWM": case "devRPiPWM":
key = ledType; key = ledType;
if (discoveryInfo.devices.length == 0) { if (!discoveryInfo.isUserAdmin) {
enumVals.push("NONE"); enumVals.push("NONE");
enumTitleVals.push($.i18n('edt_dev_spec_devices_discovered_none')); enumTitleVals.push($.i18n('edt_dev_spec_devices_discovered_none'));
$('#btn_submit_controller').prop('disabled', true); $('#btn_submit_controller').prop('disabled', true);

10
libsrc/leddevice/dev_rpi_pwm/LedDeviceWS281x.cpp
View File

@ -159,12 +159,10 @@ QJsonObject LedDeviceWS281x::discover(const QJsonObject& /*params*/)
QJsonArray deviceList; QJsonArray deviceList;
if (SysInfo::isUserAdmin()) //Indicate the general availability of the device, if hyperion is run under root
{ devicesDiscovered.insert("isUserAdmin", SysInfo::isUserAdmin());
//Indicate the general availability of the device, if hyperion is run under root
deviceList << QJsonObject ({{"found",true}}); devicesDiscovered.insert("devices", deviceList);
devicesDiscovered.insert("devices", deviceList);
}
DebugIf(verbose,_log, "devicesDiscovered: [%s]", QString(QJsonDocument(devicesDiscovered).toJson(QJsonDocument::Compact)).toUtf8().constData()); DebugIf(verbose,_log, "devicesDiscovered: [%s]", QString(QJsonDocument(devicesDiscovered).toJson(QJsonDocument::Compact)).toUtf8().constData());