crtxcr/qswiki
1
0
Vork 0
Code Kwesties 21 Pull-aanvragen 1 Publicaties Activiteit

tree: visible => listed

Bladeren bron
This commit is contained in:
Albert S.
2024-03-16 22:03:22 +01:00
bovenliggende 18f4ad9d51
commit 03c6816528
11 gewijzigde bestanden met toevoegingen van 73 en 47 verwijderingen
Download Patch-bestand Download Diff-bestand Expand all files Collapse all files

2
handlers/handler.cpp
Bestand weergeven

@ -53,7 +53,7 @@ std::string Handler::createPageTitle(std::string title)
QueryOption Handler::queryOption(const Request &r, SORT_ORDER defaultSort) const
{
QueryOption result;
result.includeInvisible = false;
result.includeUnlisted = false;
try
{
result.limit = utils::toUInt(r.get("limit"));

15
handlers/handlerfeedgenerator.cpp
Bestand weergeven

@ -9,7 +9,7 @@ std::vector<HandlerFeedGenerator::EntryRevisionPair> HandlerFeedGenerator::fetch
std::vector<EntryRevisionPair> result;
QueryOption option;
option.includeInvisible = false;
option.includeUnlisted = true;
// option.limit = 20;
auto comppage = [](const Page &a, const Page &b) { return a.name < b.name; };
@ -34,12 +34,15 @@ std::vector<HandlerFeedGenerator::EntryRevisionPair> HandlerFeedGenerator::fetch
}
for(const Page &member : members)
{
Permissions perms = permissionDao->find(member.name, this->userSession->user.login)
.value_or(this->userSession->user.permissions);
if(perms.canRead())
if(member.feedlisted)
{
auto revision = revisionDao->getRevisionForPage(member.name, 1).value();
result.push_back({member, revision});
Permissions perms = permissionDao->find(member.name, this->userSession->user.login)
.value_or(this->userSession->user.permissions);
if(perms.canRead())
{
auto revision = revisionDao->getRevisionForPage(member.name, 1).value();
result.push_back({member, revision});
}
}
}
std::sort(result.begin(), result.end(),

12
handlers/handlerpageedit.cpp
Bestand weergeven

@ -76,7 +76,16 @@ Response HandlerPageEdit::handleRequest(PageDao &pageDao, std::string pagename,
try
{
this->database->beginTransaction();
std::string visiblecmd = parser.extractCommand("visible", newContent);
std::string listedcmd = parser.extractCommand("listed", newContent);
/* Backwarts compatibility */
if(listedcmd.empty())
{
listedcmd = visiblecmd;
}
std::string feedlistedcmd = parser.extractCommand("feedlisted", newContent);
std::string rename = parser.extractCommand("rename", newContent);
std::string customtitle = parser.extractCommand("pagetitle", newContent);
std::string parentpage = parser.extractCommand("parentpage", newContent);
@ -139,7 +148,8 @@ Response HandlerPageEdit::handleRequest(PageDao &pageDao, std::string pagename,
}
page.current_revision = current_revision;
page.listed = !(visiblecmd == "0");
page.listed = !(listedcmd == "0");
page.feedlisted = !(feedlistedcmd == "0");
page.name = pagename;
page.title = customtitle;
page.parentpage = parentpage;