Relintai/crystal_cms_rcpp_fw
1
0
Fork 0
mirror of https://github.com/Relintai/crystal_cms_rcpp_fw.git synced 2025-04-22 20:41:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated the engine to the latest.

Browse Source
This commit is contained in:
Relintai 2021-11-10 20:56:21 +01:00
parent 425b586563
commit 9f094cfdf4
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HEADS
View File

@ -1 +1 @@
{"engine": {"master": "adf847580462039e92b9b2181138136ec2928229"}}
{"engine": {"master": "5872d9d74fb4fd74bc7401fb399951a2489b8811"}}

7
app/ccms_application.cpp
View File

@ -15,7 +15,8 @@
#include "core/http/session_manager.h"
#include "modules/users/user.h"
#include "modules/users/user_controller.h"
//#include "modules/users/user_controller.h"
#include "modules/rbac_users/rbac_user_controller.h"
#include "modules/admin_panel/admin_panel.h"
#include "modules/rbac/rbac_controller.h"
@ -235,7 +236,9 @@ void CCMSApplication::setup_routes() {
void CCMSApplication::setup_middleware() {
middlewares.push_back(HandlerInstance(::SessionManager::session_setup_middleware));
middlewares.push_back(HandlerInstance(::UserController::user_session_setup_middleware));
//middlewares.push_back(HandlerInstance(::UserController::user_session_setup_middleware));
//middlewares.push_back(HandlerInstance(::RBACUserController::rbac_user_session_setup_middleware));
middlewares.push_back(HandlerInstance(::RBACUserController::rbac_default_user_session_middleware));
DWebApplication::setup_middleware();
}

2
app/ccms_user_controller.cpp
View File

@ -184,7 +184,7 @@ void CCMSUserController::render_settings_request(Ref<User> &user, Request *reque
}
CCMSUserController::CCMSUserController() :
UserController() {
RBACUserController() {
}
CCMSUserController::~CCMSUserController() {

6
app/ccms_user_controller.h
View File

@ -1,7 +1,7 @@
#ifndef CCMS_USER_CONTROLLER_H
#define CCMS_USER_CONTROLLER_H
#include "modules/users/user_controller.h"
#include "modules/rbac_users/rbac_user_controller.h"
#include <string>
#include "modules/users/user.h"
@ -9,8 +9,8 @@
class Request;
class FormValidator;
class CCMSUserController : public UserController {
RCPP_OBJECT(CCMSUserController, UserController);
class CCMSUserController : public RBACUserController {
RCPP_OBJECT(CCMSUserController, RBACUserController);
public:
void render_login_request_default(Request *request, LoginRequestData *data);
void render_register_request_default(Request *request, RegisterRequestData *data);

4
main.cpp
View File

@ -23,7 +23,7 @@
#include "app/ccms_user_controller.h"
#include "modules/users/user.h"
#include "modules/users/user_model.h"
#include "modules/rbac_users/rbac_user_model.h"
#include "core/database/database_manager.h"
#include "platform/platform_initializer.h"
@ -63,7 +63,7 @@ int main(int argc, char **argv, char **envp) {
//todo init these in the module automatically
UserController *user_controller = new CCMSUserController();
UserModel *user_model = new UserModel();
RBACUserModel *user_model = new RBACUserModel();
//user_manager->set_path("./users/");
Settings *settings = new Settings(true);