diff --git a/api/recorder_api.py b/api/recorder_api.py index f9574aa..695efe6 100644 --- a/api/recorder_api.py +++ b/api/recorder_api.py @@ -50,7 +50,7 @@ recorder_command_model = api_recorder.model('Recorder Command', { 'name': fields.String(required=True, description='The recorder command\'s name'), 'last_time_modified': fields.DateTime(required=False), 'description': fields.String(required=False, description='The recorder command\'s description'), - 'parameters': fields.String(required=True, description='The recorder parameters'), + 'parameters': fields.Raw(required=True, description='The recorder parameters'), 'recorder_model': fields.Nested(api_recorder.model('recorder_command_models', {'id': fields.Integer(), 'name': fields.String()})), }) diff --git a/app.db b/app.db index 6c62f62..bd2019a 100644 Binary files a/app.db and b/app.db differ diff --git a/models/recorder_model.py b/models/recorder_model.py index 3a4bfce..876121b 100644 --- a/models/recorder_model.py +++ b/models/recorder_model.py @@ -98,11 +98,10 @@ class RecorderCommand(db.Model): def get_all(): return RecorderCommand.query.all() - @hybrid_property + @property def parameters(self): if self.parameters_string is None: - return [] - print(self.parameters_string) + return None return json.loads(self.parameters_string) @parameters.setter