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:
@@ -39,6 +39,7 @@
|
||||
#include "space/space.h"
|
||||
#include "date/date.h"
|
||||
#include "model.h"
|
||||
#include "templates/htmltextstream.h"
|
||||
|
||||
|
||||
namespace Winix
|
||||
@@ -230,6 +231,9 @@ public:
|
||||
bool CanContentBeHtmlFiltered();
|
||||
|
||||
|
||||
static void print_content(HtmlTextStream & out, const std::wstring & content, ItemContent::ContentType content_type, bool is_html_filter_on);
|
||||
void print_content(Ezc::FunInfo<HtmlTextStream> & env);
|
||||
|
||||
bool do_migration(int & current_table_version);
|
||||
|
||||
|
||||
@@ -240,6 +244,8 @@ protected:
|
||||
bool do_migration_to_2();
|
||||
bool do_migration_to_3();
|
||||
|
||||
MORM_MEMBER_FIELD(ItemContent)
|
||||
|
||||
};
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user