From 9893049ec9a3f89d6e93d0194b18c816dd8f10f0 Mon Sep 17 00:00:00 2001 From: Rosia E Evans Date: Fri, 13 Oct 2023 18:01:03 +0100 Subject: [PATCH] fixes bug where categories were taken from default source folder when alternative was given --- Src/BlogPageBuilder.cpp | 6 +++--- Src/BlogPageBuilder.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Src/BlogPageBuilder.cpp b/Src/BlogPageBuilder.cpp index 1e71709..f9a116f 100644 --- a/Src/BlogPageBuilder.cpp +++ b/Src/BlogPageBuilder.cpp @@ -16,7 +16,7 @@ BlogPageBuilder::BlogPageBuilder(std::string templateFileUrl, std::string inFold collectPages(); NavBarGenerator* navGen = new NavBarGenerator(); - navSection = navGen->generateNavSection(pages, options); + navSection = navGen->generateNavSection(pages, inFolder, options); delete navGen; } @@ -129,12 +129,12 @@ std::string NavBarGenerator::insertPagesIntoCategories(std::string categories, s return categories; } -std::string NavBarGenerator::generateNavSection(std::vector pages, int options) +std::string NavBarGenerator::generateNavSection(std::vector pages, std::string sourceFolderUrl, int options) { this->options = options; std::string buffer; buffer.append(navHeader); - buffer.append(generateCategories(SOURCE_FILE_FOLDER)); + buffer.append(generateCategories(sourceFolderUrl)); buffer = insertPagesIntoCategories(buffer, pages); return buffer; } diff --git a/Src/BlogPageBuilder.h b/Src/BlogPageBuilder.h index 4ed2e2c..c04715f 100644 --- a/Src/BlogPageBuilder.h +++ b/Src/BlogPageBuilder.h @@ -34,7 +34,7 @@ private: bool isOptionEnabled(int flag); public: - std::string generateNavSection(std::vector pages, int options); + std::string generateNavSection(std::vector pages, std::string sourceFolderUrl, int options); }; class BlogPageBuilder