arcanis/queued
1
0
Fork 0
mirror of https://github.com/arcan1s/queued.git synced 2025-04-24 23:47:19 +00:00
Code Issues Projects Releases Wiki Activity

merge changes

Browse Source
This commit is contained in:
Evgenii Alekseev 2017-04-10 00:25:29 +03:00
commit f68d607da8
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sources/queued-server/src/QueuedTcpServerResponseHelperApi1.cpp
View File

@ -99,9 +99,12 @@ QVariantHash QueuedTcpServerResponseHelperApi1::getData(
else if (_type == "POST") else if (_type == "POST")
output = QueuedTcpServerResponseHelperTask::addOrEditTask( output = QueuedTcpServerResponseHelperTask::addOrEditTask(
_arg.toLongLong(), _data, _token); _arg.toLongLong(), _data, _token);
<<<<<<< HEAD
else if (_type == "PUT") else if (_type == "PUT")
output = QueuedTcpServerResponseHelperTask::startOrStopTask( output = QueuedTcpServerResponseHelperTask::startOrStopTask(
_arg.toLongLong(), _token); _arg.toLongLong(), _token);
=======
>>>>>>> baa20af363cb4b97cb6f7b36f833cf40f34cc61d
else else
output = {{"code", 405}}; output = {{"code", 405}};
break; break;

4
sources/queued/include/queued/QueuedCoreAdaptor.h
View File

@ -215,6 +215,10 @@ QHash<QString, QHash<QString, QString>> getStatus();
* @return task properties * @return task properties
*/ */
QVariantHash getTask(const long long _id); QVariantHash getTask(const long long _id);
/**
* @return server status inforamtion
*/
QHash<QString, QHash<QString, QString>> getStatus();
/** /**
* @brief get task property * @brief get task property
* @param _id * @param _id

3
sources/queued/src/QueuedPropertyInterface.cpp
View File

@ -106,8 +106,11 @@ QDBusVariant QueuedPropertyInterface::User(const long long id,
return QDBusVariant(response); return QDBusVariant(response);
} else { } else {
auto response = user->property(qPrintable(property)); auto response = user->property(qPrintable(property));
<<<<<<< HEAD
if (response.type() == QVariant::DateTime) if (response.type() == QVariant::DateTime)
response = response.toDateTime().toString(Qt::ISODateWithMs); response = response.toDateTime().toString(Qt::ISODateWithMs);
=======
>>>>>>> baa20af363cb4b97cb6f7b36f833cf40f34cc61d
return QDBusVariant(response.isValid() ? response : ""); return QDBusVariant(response.isValid() ? response : "");
} }
} }