renamed: WinixModel -> WinixModelDeprecated (this class will be removed)
added: WinixModel (models/winixmodel.h|cpp) - a class inheriting from morm::WinixModel, we have methods such as: get_config(), get_logger(), get_request() and this class will be a base class for our models added: WinixModelConnector (models/winixmodelconnector.h|cpp) - a class inheriting from morm::WinixModelConnector this connector we are using instead of morm::ModelConnector - there are pointers to winix objects there (config, request, log) added to Request: Ezc::Models models removed from TemplatesFunctions: Ezc::Models ezc_models; changed: ImgCrop winix functions is using its own item_tab vector now (not finished yet) added: Item::is(), Item::link(), ItemContent::print_content()
This commit is contained in:
@@ -74,10 +74,10 @@ void insert_page_run(Info & i)
|
||||
|
||||
info.run_content.Clear();
|
||||
|
||||
InitGenerator(info.ezc_gen);
|
||||
InitGenerator(info.ezc_gen, cur->request->models);
|
||||
info.ezc_gen.SetPattern(*pat);
|
||||
info.ezc_gen.Generate(info.run_content);
|
||||
item_print_content(i.out, info.run_content.Str(), info.item.item_content.content_raw_type);
|
||||
ItemContent::print_content(i.out, info.run_content.Str(), info.item.item_content.content_raw_type, config->html_filter);
|
||||
|
||||
insert_page_cur -= 1;
|
||||
}
|
||||
@@ -119,7 +119,7 @@ void insert_page(Info & i)
|
||||
insert_page_run(i);
|
||||
else
|
||||
if( system->HasReadAccess(info.item) )
|
||||
item_print_content(i.out, info.item.item_content.content_raw, info.item.item_content.content_raw_type);
|
||||
ItemContent::print_content(i.out, info.item.item_content.content_raw, info.item.item_content.content_raw_type, config->html_filter);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user