Commit 4c59e305 authored by jan.koester's avatar jan.koester
Browse files

test

parent 1bd60c55
Loading
Loading
Loading
Loading
+13 −0
Changes for editor/src/webedit_api.cpp: 13 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2181,6 +2181,19 @@ void webedit::Api::handleTemplateBulkGenerate(libhttppp::HttpRequest &curreq,
                                                              targetGroup,
                                                              existingDocId);

            if (exists && existingDocId == tpl.id) {
                ++conflictsCount;
                json_object *conflictObj = json_object_new_object();
                json_object_object_add(conflictObj, "id", json_object_new_string(existingDocId.c_str()));
                json_object_object_add(conflictObj, "name", json_object_new_string(tpl.name.c_str()));
                json_object_object_add(conflictObj, "group", json_object_new_string(targetGroup.c_str()));
                json_object_object_add(conflictObj, "template_id", json_object_new_string(tpl.id.c_str()));
                json_object_object_add(conflictObj, "error", json_object_new_string("Cannot overwrite the template itself"));
                json_object_object_add(conflictObj, "row_index", json_object_new_int64(static_cast<long long>(rowIndex)));
                json_object_array_add(conflictsArr, conflictObj);
                continue;
            }

            if (exists && !overwriteExisting) {
                ++conflictsCount;
                json_object *conflictObj = json_object_new_object();