Browse Source

[FIX] odoo creation response format

Gogs 7 years ago
parent
commit
8e0090bc8e
3 changed files with 7 additions and 3 deletions
  1. 1 0
      .env
  2. 4 2
      api/resources/odoo_resource.py
  3. 2 1
      odoo_control/settings.py

+ 1 - 0
.env

@@ -4,6 +4,7 @@ DEBUG = True
 JWT_ACCEPT_HEADER = 'HTTP_AUTHORIZATION'
 JWT_PREFIX_HEADER = 'JWT'
 JWT_SECRET_KEY = '123456789'
+SERVER_IP = '192.168.88.100'
 DOCKER_SOCK_DIR = '/var/run/docker.sock'
 DOCKER_NETWORK = '127.0.0.1'
 DOCKER_NETWORK_NAME = 'eiru'

+ 4 - 2
api/resources/odoo_resource.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 from django.conf.urls import url
+from django.conf import settings
 from tastypie.resources import Resource
 from tastypie.utils import trailing_slash
 from simplejson import JSONDecodeError
@@ -94,8 +95,9 @@ class OdooResource(Resource):
         apply_permissions(name)
 
         return self.create_response(request, {
-            'odoo': {
-                'name': name,
+            'action': {
+                'type': 'redirect',
+                'ip': settings.SERVER_IP,
                 'port': port
             }
         })

+ 2 - 1
odoo_control/settings.py

@@ -79,8 +79,9 @@ DEBUG = config('DEBUG', default=False, cast=bool)
 JWT_ACCEPT_HEADER = config('JWT_ACCEPT_HEADER')
 JWT_PREFIX_HEADER = config('JWT_PREFIX_HEADER')
 JWT_SECRET_KEY = config('JWT_SECRET_KEY')
+SERVER_IP = config('SERVER_IP')
 DOCKER_SOCK_DIR = config('DOCKER_SOCK_DIR')
-DOCKER_NETWORK = config('DOCKER_NETWORK', '127.0.0.1')
+DOCKER_NETWORK = config('DOCKER_NETWORK')
 DOCKER_NETWORK_NAME = config('DOCKER_NETWORK_NAME', 'default')
 ODOO_IMAGE = config('ODOO_IMAGE')
 ODOO_ROOT_PATH = config('ODOO_ROOT_PATH')