github-personal/sysadm
1
0
Fork 0
mirror of https://github.com/outbackdingo/sysadm.git synced 2026-01-27 02:20:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:trueos/sysadm

Browse Source
This commit is contained in:
Mrt134
2016-08-16 11:38:57 -04:00
parent 4e6f1f79d2 72479c177c
commit 4c2f3c9f7c
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/WebBackend.cpp
View File

@@ -931,7 +931,7 @@ RestOutputStruct::ExitCode WebSocket::EvaluateSysadmUserRequest(bool allaccess,
QString deluser = in_args.toObject().value("name").toString();
if(deluser != user){ //cannot delete the currently-used user
bool clean = true;
if(in_args.toObject().contains("clean_home")){ clean = (in_args.toObject().value("clean_home").toString().toLower() == "false"); }
if(in_args.toObject().contains("clean_home")){ clean = (in_args.toObject().value("clean_home").toString().toLower() != "false"); }
ok = sysadm::UserManager::removeUser(deluser, clean);
if(ok){ out->insert("result","success"); }
else{ out->insert("error","Could not delete user"); }

16
src/server/library/sysadm-beadm.cpp
View File

@@ -212,14 +212,14 @@ QJsonObject BEADM::listBEs() {
// Unmount the given boot environment immediately. Confirmation should be done through the client.
QJsonObject BEADM::umountBE(QJsonObject jsin) {
QJsonObject retObject;
QJsonObject BEADM::umountBE(QJsonObject jsin) {
QJsonObject retObject;
QStringList keys = jsin.keys();
if (! keys.contains("be") ) {
retObject.insert("error", "Missing required key(s) 'be'");
return retObject;
}
QStringList keys = jsin.keys();
if (! keys.contains("be") ) {
retObject.insert("error", "Missing required key(s) 'be'");
return retObject;
}
// Get the key values
@@ -238,4 +238,4 @@ QJsonObject BEADM::listBEs() {
retObject.insert("be", be);
return retObject;
}
}