[ADD] changes made to 19 are made in testserver16 as well
This commit is contained in:
@@ -1,4 +1,6 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from . import controllers
|
||||
from . import models
|
||||
from . import models
|
||||
from . import wizard
|
||||
from .hooks import post_init_hook
|
||||
|
||||
@@ -11,11 +11,16 @@
|
||||
|
||||
'author': "Open2bizz",
|
||||
'website': "http://www.open2bizz.tech",
|
||||
'category': 'Uncategorized',
|
||||
'version': '0.1',
|
||||
'category': 'Tools',
|
||||
'license': "AGPL-3",
|
||||
'version': '16.0.1.0.0',
|
||||
'module_type': 'official',
|
||||
'depends': ['mail','base',],
|
||||
'data': [
|
||||
'wizard/install_warning_wizard_view.xml',
|
||||
'views/views.xml',
|
||||
'data/data.xml'
|
||||
'data/data.xml',
|
||||
'security/ir.model.access.csv',
|
||||
],
|
||||
'post_init_hook': 'post_init_hook',
|
||||
}
|
||||
|
||||
@@ -1,3 +1,2 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from . import controllers
|
||||
@@ -1,21 +1,55 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
# from odoo import http
|
||||
# Copyright 2024 Open2Bizz <info@open2bizz.nl>
|
||||
# License LGPL-3
|
||||
|
||||
import logging
|
||||
import requests
|
||||
|
||||
from odoo import http
|
||||
from odoo.http import request, Response
|
||||
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
MAILHOG_BASE = "http://localhost:8025"
|
||||
|
||||
|
||||
# class TestserverO2b(http.Controller):
|
||||
# @http.route('/testserver_o2b/testserver_o2b/', auth='public')
|
||||
# def index(self, **kw):
|
||||
# return "Hello, world"
|
||||
class MailcatcherProxy(http.Controller):
|
||||
|
||||
# @http.route('/testserver_o2b/testserver_o2b/objects/', auth='public')
|
||||
# def list(self, **kw):
|
||||
# return http.request.render('testserver_o2b.listing', {
|
||||
# 'root': '/testserver_o2b/testserver_o2b',
|
||||
# 'objects': http.request.env['testserver_o2b.testserver_o2b'].search([]),
|
||||
# })
|
||||
@http.route(['/mailcatcher', '/mailcatcher/<path:subpath>'],
|
||||
type='http', auth='user', website=False, csrf=False)
|
||||
def mailcatcher_proxy(self, subpath='', **kw):
|
||||
"""Proxy requests to the local MailHog instance."""
|
||||
target_url = f"{MAILHOG_BASE}/{subpath}"
|
||||
if request.httprequest.query_string:
|
||||
target_url += '?' + request.httprequest.query_string.decode('utf-8')
|
||||
|
||||
# @http.route('/testserver_o2b/testserver_o2b/objects/<model("testserver_o2b.testserver_o2b"):obj>/', auth='public')
|
||||
# def object(self, obj, **kw):
|
||||
# return http.request.render('testserver_o2b.object', {
|
||||
# 'object': obj
|
||||
# })
|
||||
try:
|
||||
headers = {
|
||||
k: v for k, v in request.httprequest.headers
|
||||
if k.lower() not in ('host', 'cookie', 'authorization')
|
||||
}
|
||||
resp = requests.request(
|
||||
method=request.httprequest.method,
|
||||
url=target_url,
|
||||
headers=headers,
|
||||
data=request.httprequest.get_data(),
|
||||
timeout=30,
|
||||
allow_redirects=False,
|
||||
)
|
||||
except requests.exceptions.ConnectionError:
|
||||
_logger.warning("Could not connect to MailHog at %s", MAILHOG_BASE)
|
||||
return Response("MailHog is not available", status=502)
|
||||
|
||||
excluded_headers = {
|
||||
'content-encoding', 'content-length', 'transfer-encoding',
|
||||
'connection',
|
||||
}
|
||||
response_headers = [
|
||||
(k, v) for k, v in resp.headers.items()
|
||||
if k.lower() not in excluded_headers
|
||||
]
|
||||
|
||||
return Response(
|
||||
resp.content,
|
||||
status=resp.status_code,
|
||||
headers=response_headers,
|
||||
)
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
<odoo>
|
||||
<data>
|
||||
<function model="ir.config_parameter" name="_mailcatcher_url"/>
|
||||
</data>
|
||||
</odoo>
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
from . import mailcatcher_menu
|
||||
# No models needed — MailHog is accessed via the proxy controller
|
||||
|
||||
@@ -1,29 +1,5 @@
|
||||
# Copyright 2024 Open2Bizz <info@open2bizz.nl>
|
||||
# License LGPL-3
|
||||
|
||||
from odoo import api, fields, models, _
|
||||
|
||||
import logging
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
class IrActionUrl(models.Model):
|
||||
_inherit = "ir.config_parameter"
|
||||
|
||||
@api.model
|
||||
#def init(self):
|
||||
def _mailcatcher_url(self):
|
||||
parameters = self.env['ir.config_parameter'].search([('key','=', 'web.base.url')])
|
||||
if parameters:
|
||||
parameter = parameters[0]
|
||||
cont_nr = parameter.value.split("//",1)[1] #Haal https:// van string
|
||||
cont_nr = cont_nr[0:3] #De eerste 3 karakters is het containernummer
|
||||
node = parameter.value.split("staging",1)[1] #Haal alles van string weg t/m staging
|
||||
node = node[0:1] #Het eerste karakters is het de stagingarea
|
||||
act_url = "https://" + cont_nr + "-mailcatcher.staging" + node + ".open2bizz.com"
|
||||
_logger.info('---------- ACT_URL ---------- %s', act_url)
|
||||
action_id = self.env['ir.model.data']._xmlid_to_res_id('mailcatcher_menu.action_mailcatcher_url')
|
||||
action = self.env['ir.actions.act_url'].browse(action_id)
|
||||
if action:
|
||||
action.write({'url':act_url})
|
||||
|
||||
|
||||
# MailHog is now accessed via the internal proxy controller at /mailcatcher/
|
||||
# so no dynamic URL computation is needed anymore.
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
|
||||
"access_mailcatcher_menu_mailcatcher_menu","mailcatcher_menu.mailcatcher_menu","model_mailcatcher_menu_mailcatcher_menu","base.group_user",1,1,1,1
|
||||
"access_mailcatcher_install_warning_wizard","mailcatcher.install.warning.wizard","model_mailcatcher_install_warning_wizard","base.group_user",1,1,1,1
|
||||
|
@@ -1,18 +1,20 @@
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
|
||||
|
||||
<body>
|
||||
<div class="document" id="module-name">
|
||||
<h1 class="title">mailcatcher_menu</h1>
|
||||
<p>
|
||||
This module is ONLY for test environments In DC Open2Bizz
|
||||
</p>
|
||||
<div class="document" id="module-name">
|
||||
<h1 class="title">mailcatcher_menu</h1>
|
||||
<p>
|
||||
This module is ONLY for test environments In DC Open2Bizz
|
||||
</p>
|
||||
|
||||
<p>
|
||||
Module is developed by Open2Bizz. Bug reports: support@open2bizz.eu
|
||||
</p>
|
||||
<p>
|
||||
<img src="https://www.open2bizz.tech/logo.png" style="max-height: 100px;">
|
||||
</p>
|
||||
<p>
|
||||
Module is developed by Open2Bizz. Bug reports: support@open2bizz.eu
|
||||
</p>
|
||||
<p>
|
||||
<img src="https://www.open2bizz.tech/logo.png" style="max-height: 100px;">
|
||||
</p>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
</html>
|
||||
@@ -3,12 +3,12 @@
|
||||
|
||||
<record model="ir.actions.act_url" id="action_mailcatcher_url">
|
||||
<field name="name">Open Mailcatcher</field>
|
||||
<field name="url">https://mailcatcher.staging.open2bizz.com</field>
|
||||
<field name="url">/mailcatcher/</field>
|
||||
<field name="target">new</field>
|
||||
</record>
|
||||
|
||||
<!-- Top menu item -->
|
||||
<menuitem name="MailCatcher" id="mailcatcher_menu.menu_root" sequence="99" web_icon="mailcatcher_menu,static/description/email-icon.png" action="action_mailcatcher_url"/>
|
||||
<menuitem name="MailCatcher" id="mailcatcher_menu.menu_root" sequence="999" web_icon="mailcatcher_menu,static/description/email-icon.png" action="action_mailcatcher_url"/>
|
||||
|
||||
</data>
|
||||
</odoo>
|
||||
|
||||
Reference in New Issue
Block a user