DressOrc/Blog
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes bug where categories were taken from default source folder when alternative was given

Browse source
This commit is contained in:
Rosia E Evans 2023-10-13 18:01:03 +01:00
parent 7b7f967d74
commit 9893049ec9
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Src/BlogPageBuilder.cpp
View file

@ -16,7 +16,7 @@ BlogPageBuilder::BlogPageBuilder(std::string templateFileUrl, std::string inFold
collectPages(); collectPages();
NavBarGenerator* navGen = new NavBarGenerator(); NavBarGenerator* navGen = new NavBarGenerator();
navSection = navGen->generateNavSection(pages, options); navSection = navGen->generateNavSection(pages, inFolder, options);
delete navGen; delete navGen;
} }
@ -129,12 +129,12 @@ std::string NavBarGenerator::insertPagesIntoCategories(std::string categories, s
return categories; return categories;
} }
std::string NavBarGenerator::generateNavSection(std::vector<Page*> pages, int options) std::string NavBarGenerator::generateNavSection(std::vector<Page*> pages, std::string sourceFolderUrl, int options)
{ {
this->options = options; this->options = options;
std::string buffer; std::string buffer;
buffer.append(navHeader); buffer.append(navHeader);
buffer.append(generateCategories(SOURCE_FILE_FOLDER)); buffer.append(generateCategories(sourceFolderUrl));
buffer = insertPagesIntoCategories(buffer, pages); buffer = insertPagesIntoCategories(buffer, pages);
return buffer; return buffer;
} }

2
Src/BlogPageBuilder.h
View file

@ -34,7 +34,7 @@ private:
bool isOptionEnabled(int flag); bool isOptionEnabled(int flag);
public: public:
std::string generateNavSection(std::vector<Page*> pages, int options); std::string generateNavSection(std::vector<Page*> pages, std::string sourceFolderUrl, int options);
}; };
class BlogPageBuilder class BlogPageBuilder