fixed in Item: void Item::link(Ezc::FunInfo<HtmlTextStream> & env) now returns a correct directory for the item (before the current directory was returned)

added to Item: void Item::dir_link(Ezc::FunInfo<HtmlTextStream> & env)
added to WinixModel:
  Dirs * get_dirs();
  Mounts * get_mounts();
  Users * get_users();
  Groups * get_groups();
  SLog * get_session_logger(); // not finished yet
This commit is contained in:
2021-06-16 23:42:23 +02:00
parent 53fe5c35b9
commit ab89ffe096
9 changed files with 208 additions and 16 deletions

View File

@@ -331,6 +331,11 @@ bool App::Init()
model_connector.set_winix_config(&config);
model_connector.set_winix_request(&req);
model_connector.set_winix_logger(&log);
model_connector.set_winix_dirs(&system.dirs);
model_connector.set_winix_mounts(&system.mounts);
model_connector.set_winix_users(&system.users);
model_connector.set_winix_groups(&system.groups);
model_connector.set_winix_session_logger(nullptr); // will be set for each request
if( !TryToMakeDatabaseMigration() )
return false;

View File

@@ -106,10 +106,6 @@ public:
/*
model
*/
// ...
System system;
@@ -121,9 +117,6 @@ public:
bool stdout_is_closed;
/*
view
*/
Templates templates;

View File

@@ -95,9 +95,19 @@ void ThreadManager::Add(BaseThread * pbase, const wchar_t * thread_name)
data.postgresql_connector.wait_for_connection();
data.model_connector.set_db_connector(data.postgresql_connector);
data.model_connector.set_flat_connector(data.json_connector);
data.model_connector.set_winix_config(config);
data.model_connector.set_winix_logger(item.object->get_logger());
data.model_connector.set_logger(item.object->get_logger());
data.model_connector.set_winix_config(config);
data.model_connector.set_winix_request(nullptr);
data.model_connector.set_winix_logger(item.object->get_logger());
data.model_connector.set_winix_dirs(nullptr);
data.model_connector.set_winix_mounts(nullptr);
data.model_connector.set_winix_users(nullptr);
data.model_connector.set_winix_groups(nullptr);
data.model_connector.set_winix_session_logger(nullptr);
//data.model_connector.set_winix_request();
item.object->set_model_connector(&data.model_connector);