fixes bug where categories were taken from default source folder when alternative was given
This commit is contained in:
parent
7b7f967d74
commit
9893049ec9
2 changed files with 4 additions and 4 deletions
|
@ -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<Page*> pages, int options)
|
||||
std::string NavBarGenerator::generateNavSection(std::vector<Page*> 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;
|
||||
}
|
||||
|
|
|
@ -34,7 +34,7 @@ private:
|
|||
bool isOptionEnabled(int flag);
|
||||
|
||||
public:
|
||||
std::string generateNavSection(std::vector<Page*> pages, int options);
|
||||
std::string generateNavSection(std::vector<Page*> pages, std::string sourceFolderUrl, int options);
|
||||
};
|
||||
|
||||
class BlogPageBuilder
|
||||
|
|
Loading…
Add table
Reference in a new issue