Item class has been moved to a new directory 'models', a new class has been added: ItemContent
and same fields from Item were moved to ItemContent Item - id - parent_id - type (file, dir, symlink) - url - subject - template (html template) - sort_index - content_id ItemContent - id - ref -> references (renamed) - user_id - modification_user_id - group_id - privileges - date_creation - date_modification - guest_name - link_to - link_redirect - file_path - file_fs - file_type - file_size - has_thumb -> file_has_thumb (renamed) - hash -> file_hash (renamed) - hash_type -> file_hash_type (renamed) - content -> content_raw (renamed) - content_type -> content_raw_type (renamed) - content_parsed - content_parsed_type - meta - ameta -> meta_admin (renamed) - modify_index (removed) WIP: #4
This commit is contained in:
@@ -5,7 +5,7 @@
|
||||
*/
|
||||
|
||||
/*
|
||||
* Copyright (c) 2016-2018, Tomasz Sowa
|
||||
* Copyright (c) 2016-2021, Tomasz Sowa
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
@@ -77,7 +77,7 @@ void ReloadConfigFile(PluginInfo & info, Item & file)
|
||||
PT::SpaceParser parser;
|
||||
|
||||
parser.SetSpace(space);
|
||||
PT::SpaceParser::Status status = parser.ParseString(file.content);
|
||||
PT::SpaceParser::Status status = parser.ParseString(file.item_content.content_raw);
|
||||
|
||||
if( status == PT::SpaceParser::syntax_error )
|
||||
{
|
||||
@@ -118,13 +118,23 @@ void ConfigReload(PluginInfo & info)
|
||||
|
||||
if( dir )
|
||||
{
|
||||
DbItemQuery iq;
|
||||
// DbItemQuery iq;
|
||||
std::vector<Item> items;
|
||||
//
|
||||
// iq.SetAll(true, false);
|
||||
// iq.WhereParentId(dir->id);
|
||||
|
||||
iq.SetAll(true, false);
|
||||
iq.WhereParentId(dir->id);
|
||||
// CHECKME is it correct to get connector from the last item?
|
||||
morm::ModelConnector * model_connector = info.cur->request->last_item->get_connector();
|
||||
morm::Finder<Item> finder(model_connector);
|
||||
|
||||
info.db->GetItems(items, iq);
|
||||
finder.
|
||||
select().
|
||||
where().
|
||||
eq(L"parent_id", dir->id).
|
||||
get_vector(items);
|
||||
|
||||
//info.db->GetItems(items, iq);
|
||||
|
||||
for(Item & item : items)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user