From bb1fdcbad0b95c63d02e30abc6e1ed576b09c616 Mon Sep 17 00:00:00 2001 From: Emmanuel Garette Date: Tue, 3 Dec 2019 08:47:12 +0100 Subject: [PATCH] save_values --- src/risotto/services/session/session.py | 7 ++++++- src/risotto/services/session/storage.py | 9 --------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/risotto/services/session/session.py b/src/risotto/services/session/session.py index 221d951..a61073e 100644 --- a/src/risotto/services/session/session.py +++ b/src/risotto/services/session/session.py @@ -196,12 +196,17 @@ class Risotto(Controller): session = self.get_session(session_id, type) id_ = session['id'] + config_module = dispatcher.get_service('config') if type == 'server': storage = storage_server + config = config_module.server[id_]['server'] else: storage = storage_servermodel + config = config_module.servermodel[id_] if save: - storage.save_values(session_id) + modif_config = session['config'] + config.value.importation(modif_config.value.exportation()) + config.permissive.importation(modif_config.permissive.exportation()) storage.del_session(session_id) return self.format_session(session_id, session) diff --git a/src/risotto/services/session/storage.py b/src/risotto/services/session/storage.py index 432fee2..1d1ff39 100644 --- a/src/risotto/services/session/storage.py +++ b/src/risotto/services/session/storage.py @@ -85,15 +85,6 @@ class Storage(object): raise Exception(f'the session {id} not exists') return self.sessions[id] - def save_values(self, id_): - # FIXME - config = self.sessions[id_]['config'] - server_id = self.sessions[id_]['id'] - orig_config = self.sessions[id_]['orig_config'] - values = config.value.exportation() - orig_config.value.importation(values) - orig_config.permissive.importation(config.permissive.exportation()) - def get_username(self, id: int): return self.get_session(id)['username']