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:
@@ -183,7 +183,7 @@ void thread_sort_tab_print_content(Info & i)
|
||||
std::wstring & content = thread_info.item_sort_tab[item_sort_index]->item_content.content_raw;
|
||||
ItemContent::ContentType type = thread_info.item_sort_tab[item_sort_index]->item_content.content_raw_type;
|
||||
|
||||
item_print_content(i.out, content, type);
|
||||
ItemContent::print_content(i.out, content, type, config->html_filter);
|
||||
}
|
||||
|
||||
|
||||
@@ -354,11 +354,11 @@ void thread_sort_tab_run(Info & i)
|
||||
Ezc::Pattern * p = pattern_cacher.GetPattern(*thread_info.item_sort_tab[item_sort_index]);
|
||||
|
||||
item_run_content.Clear();
|
||||
InitGenerator(ezc_generator);
|
||||
InitGenerator(ezc_generator, cur->request->models);
|
||||
ezc_generator.SetPattern(*p);
|
||||
ezc_generator.Generate(item_run_content);
|
||||
|
||||
item_print_content(i.out, item_run_content.Str(), thread_info.item_sort_tab[item_sort_index]->item_content.content_raw_type);
|
||||
ItemContent::print_content(i.out, item_run_content.Str(), thread_info.item_sort_tab[item_sort_index]->item_content.content_raw_type, config->html_filter);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
Reference in New Issue
Block a user