Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
+5
-5
@@ -107,7 +107,7 @@ void NotificationManagementDialog::onAcknowledgeNotification()
|
||||
m_requestHelper->startSingleRequest(
|
||||
[&]()
|
||||
{
|
||||
DEBUG_LOG() << "m_ftc->readReceipt ";
|
||||
DEBUG_LOG(m_logger) << "m_ftc->readReceipt ";
|
||||
return m_ftc->readReceiptRequest(request, this);
|
||||
});
|
||||
}
|
||||
@@ -162,7 +162,7 @@ void NotificationManagementDialog::onRemoveNotification()
|
||||
m_requestHelper->startSingleRequest(
|
||||
[&]()
|
||||
{
|
||||
DEBUG_LOG() << "m_ftc->readReceipt ";
|
||||
DEBUG_LOG(m_logger) << "m_ftc->readReceipt ";
|
||||
return m_ftc->deleteMessageRequest(request, this);
|
||||
});
|
||||
}
|
||||
@@ -187,7 +187,7 @@ void NotificationManagementDialog::onShowNotificationContent()
|
||||
QString content = QCoreApplication::translate("Notification", noti.content().c_str());
|
||||
|
||||
NomNotification notiDDS = m_dtc->nomNotification(noti.id());
|
||||
DEBUG_LOG() << "onShowNotificationContent"
|
||||
DEBUG_LOG(m_logger) << "onShowNotificationContent"
|
||||
<< ", content=" << noti.content()
|
||||
<< ", contentArgs().size()=" << noti.contentArgs().size()
|
||||
<< ", notiDDS.contentArgs().size()=" << notiDDS.contentArgs().size();
|
||||
@@ -195,7 +195,7 @@ void NotificationManagementDialog::onShowNotificationContent()
|
||||
for (const std::string& arg : notiDDS.contentArgs()) {
|
||||
|
||||
content = content.arg(QString::fromStdString(arg));
|
||||
DEBUG_LOG() << ".arg() ersetzt immer den kleinsten freien Platzhalter"
|
||||
DEBUG_LOG(m_logger) << ".arg() ersetzt immer den kleinsten freien Platzhalter"
|
||||
<< ", arg=" << arg
|
||||
<< ", content=" << content;
|
||||
}
|
||||
@@ -211,7 +211,7 @@ void NotificationManagementDialog::onShowNotificationContent()
|
||||
wid->setMarkdown(content);
|
||||
connect(wid, &QTextBrowser::anchorClicked, this, [this, contentPopup](QUrl link )
|
||||
{
|
||||
DEBUG_LOG() << "LINK CLICKED: " << link.toString();
|
||||
DEBUG_LOG(m_logger) << "LINK CLICKED: " << link.toString();
|
||||
auto *event = new LtsWidgets::LtsLinkEvent(link, m_session->baseLayoutWidget());
|
||||
event->setAccepted(false);
|
||||
QApplication::postEvent(qApp, event);
|
||||
|
||||
+2
@@ -41,6 +41,8 @@ class NotificationManagementDialog
|
||||
void onShowNotificationContent();
|
||||
|
||||
protected:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
void onReadReceiptReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
|
||||
void onDeleteMessageReply(const Core::FunctionReplyObject &replyObject) override final { m_requestHelper->requestReply(replyObject); }
|
||||
|
||||
|
||||
+2
-2
@@ -52,7 +52,7 @@ bool NotificationManagementDialogModel::initModel(const LtsSession::LtsSessionDa
|
||||
insertRow(noti);
|
||||
});
|
||||
|
||||
INFO_LOG() << "initModel - #notis: " << m_vecData.size();
|
||||
INFO_LOG(m_logger) << "initModel - #notis: " << m_vecData.size();
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -189,7 +189,7 @@ QString NotificationManagementDialogModel::getNameByAddressId(int addressId, con
|
||||
{
|
||||
if (addr.addressType() == AddressType_def::Operator)
|
||||
{
|
||||
DEBUG_LOG() << "addressId=" << addressId
|
||||
DEBUG_LOG(m_logger) << "addressId=" << addressId
|
||||
<< ", addr.addressId()).name()=" << QString::fromStdString(m_dtcOpm->user(addr.addressId()).name());
|
||||
return QString::fromStdString(m_dtcOpm->user(addr.addressId()).name());
|
||||
}
|
||||
|
||||
+2
@@ -38,6 +38,8 @@ class NotificationManagementDialogModel final : public LtsWidgets::LtsAbstractTa
|
||||
bool initModel(const LtsSession::LtsSessionDataDds *session);
|
||||
|
||||
protected:
|
||||
|
||||
NGL::INGLLogger &m_logger;
|
||||
int getId(const NotificationManagement::NomNotification &data) const override final;
|
||||
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override final;
|
||||
|
||||
|
||||
Reference in new issue
Block a user