X-Git-Url: https://git.sven.stormbind.net/?a=blobdiff_plain;f=src%2Fconfluence-agent.cpp;h=44a5f0c087f93c20b1a3cf7556465a56a92d298b;hb=ab564585e1096b76cb929d7acc32cba6367669e4;hp=18251988448f158317d652e05b1a68e11dbf7a0e;hpb=d483bd8e6523c23c6f1d8908a2e0611c2bc9ff4f;p=sven%2Fvym.git diff --git a/src/confluence-agent.cpp b/src/confluence-agent.cpp index 1825198..44a5f0c 100644 --- a/src/confluence-agent.cpp +++ b/src/confluence-agent.cpp @@ -251,9 +251,27 @@ void ConfluenceAgent::continueJob(int nextStep) jobStep = 4; } if (jobStep == 4) { - //qDebug() << "CA::finished Created page with ID: " << pageObj["id"].toString(); + // qDebug() << "CA::finished Created page with ID: " << pageObj["id"].toString(); + // cout << QJsonDocument(pageObj).toJson(QJsonDocument::Indented).toStdString(); + model = mainWindow->getModel(modelID); + if (model) { + pageURL = QString("https://%1/pages/viewpage.action?pageId=%2") + .arg(baseURL).arg(pageObj["id"].toString()); + QString command = QString("vym.currentMap().exportMap(\"ConfluenceUpdatePage\",\"%1\")") + .arg(pageURL); + QString dest = QString("Page title: \"%1\"\nUrl: \"%2\"") + .arg(pageObj["title"].toString()).arg(pageURL); + QString desc = tr("Update existing confluence page"); + model->setExportLastCommand(command); + model->setExportLastDestination(dest); + model->setExportLastDescription(desc); + mainWindow->updateActions(); + } + mainWindow->statusMessage( QString("Created Confluence page %1").arg(pageURL)); + + finishJob(); return; } @@ -295,6 +313,7 @@ void ConfluenceAgent::continueJob(int nextStep) attachmentsAgent->startJob(); return; } + jobStep++; } if (jobStep == 4) { // Update page with parent url @@ -307,6 +326,21 @@ void ConfluenceAgent::continueJob(int nextStep) //qDebug() << "CA::finished Updated page with ID: " << pageObj["id"].toString(); mainWindow->statusMessage( QString("Updated Confluence page %1").arg(pageURL)); + + model = mainWindow->getModel(modelID); + if (model) { + pageURL = QString("https://%1/pages/viewpage.action?pageId=%2") + .arg(baseURL).arg(pageObj["id"].toString()); + QString command = QString("vym.currentMap().exportMap(\"ConfluenceUpdatePage\",\"%1\")") + .arg(pageURL); + QString dest = QString("Page title: \"%1\"\nUrl: \"%2\"").arg(pageObj["title"].toString()) + .arg(pageURL); + QString desc = tr("Update existing confluence page"); + model->setExportLastCommand(command); + model->setExportLastDestination(dest); + model->setExportLastDescription(desc); + mainWindow->updateActions(); + } finishJob(); return; } @@ -668,7 +702,7 @@ void ConfluenceAgent::pageUploaded(QNetworkReply *reply) QJsonDocument jsdoc; jsdoc = QJsonDocument::fromJson(fullReply); pageObj = jsdoc.object(); - //cout << jsdoc.toJson(QJsonDocument::Indented).toStdString(); + // cout << jsdoc.toJson(QJsonDocument::Indented).toStdString(); continueJob(); }