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:
@@ -36,8 +36,8 @@
|
||||
#define headerfile_winix_models_item
|
||||
|
||||
#include <string>
|
||||
#include "model.h"
|
||||
#include "models/itemcontent.h"
|
||||
#include "winixmodel.h"
|
||||
#include "itemcontent.h"
|
||||
|
||||
|
||||
// temporary
|
||||
@@ -89,7 +89,7 @@ public:
|
||||
};
|
||||
|
||||
|
||||
class Item : public morm::Model
|
||||
class Item : public WinixModel
|
||||
{
|
||||
public:
|
||||
|
||||
@@ -184,11 +184,11 @@ public:
|
||||
void propagate_connector();
|
||||
|
||||
|
||||
// for tests
|
||||
static void my_test_function(Ezc::FunInfo<HtmlTextStream> & env)
|
||||
{
|
||||
env.out << L"hello from function";
|
||||
}
|
||||
void print_dir(Ezc::FunInfo<HtmlTextStream> & env);
|
||||
void print_dir_without_slash(Ezc::FunInfo<HtmlTextStream> & env);
|
||||
|
||||
void is(Ezc::FunInfo<HtmlTextStream> & env);
|
||||
void link(Ezc::FunInfo<HtmlTextStream> & env);
|
||||
|
||||
|
||||
protected:
|
||||
@@ -200,6 +200,7 @@ protected:
|
||||
bool do_migration_to_3();
|
||||
bool do_migration_to_4();
|
||||
|
||||
MORM_MEMBER_FIELD(Item)
|
||||
};
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user