Commit 933824c1 authored by jan.koester's avatar jan.koester
Browse files

test

parent 78826a21
Loading
Loading
Loading
Loading
+16 −2
Changes for editor/html/js/editor.js: 16 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -1654,19 +1654,33 @@
        publishBtn.disabled = true;
        publishBtn.innerHTML = '⏳ ...';

        EditorApi.publishToConnection(connId, target, params).then(function() {
        function doPublish() {
            EditorApi.publishToConnection(connId, target, params).then(function(resp) {
                if (resp.status === 'duplicate') {
                    if (confirm(resp.message || I18n.t('I18N_PUBLISH_DUPLICATE', 'Template existiert bereits. \u00dcberschreiben?'))) {
                        params.overwrite = true;
                        doPublish();
                    } else {
                        publishBtn.innerHTML = origText;
                        publishBtn.disabled = false;
                    }
                    return;
                }
                publishBtn.innerHTML = '✅ OK';
                setTimeout(function() {
                    publishBtn.innerHTML = origText;
                    publishBtn.disabled = false;
                }, 2000);
            }).catch(function(err) {
            alert(I18n.t('I18N_PUBLISH_FAILED', 'Fehler') + ': ' + (err.error || ''));
                alert(I18n.t('I18N_PUBLISH_FAILED', 'Fehler') + ': ' + (err.error || err.message || ''));
                publishBtn.innerHTML = origText;
                publishBtn.disabled = false;
            });
        }
        
        doPublish();
    }

    function loadConnectionList() {
        EditorApi.listConnections().then(function(resp) {
            renderConnectionList(resp.connections || []);
+2 −2
Changes for editor/src/webedit_api.cpp: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -3238,9 +3238,9 @@ void webedit::Api::handlePublishToConnection(libhttppp::HttpRequest &curreq,
        }
        json_object_put(pubResp);

        if (pubStatus == "success" || pubStatus == "ok") {
        if (pubStatus == "success" || pubStatus == "ok" || pubStatus == "duplicate") {
            json_object *resp = json_object_new_object();
            json_object_object_add(resp, "status", json_object_new_string("ok"));
            json_object_object_add(resp, "status", json_object_new_string(pubStatus.c_str()));
            json_object_object_add(resp, "message", json_object_new_string(pubMessage.c_str()));
            sendJson(curreq, resp);
            json_object_put(resp);